aboutsummaryrefslogtreecommitdiff
path: root/system/include/libcxx/readme.txt
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2014-01-13 16:55:19 -0800
committerAlon Zakai <alonzakai@gmail.com>2014-01-13 16:56:03 -0800
commitcd1edebb5034ea52396a5b68304e84ae80878740 (patch)
tree6a6f8364ea74985d11c4f6ff74e5b80e08dc849d /system/include/libcxx/readme.txt
parentaf59788f8b7b76515e36bee1bf66edf497b801db (diff)
parent2914deb17f3857bb02eeec87a58a3ed6d4a8853a (diff)
Merge branch 'incoming' of github.com:kripken/emscripten into incoming1.8.8
conflicts: tests/test_core.py tools/shared.py
Diffstat (limited to 'system/include/libcxx/readme.txt')
-rw-r--r--system/include/libcxx/readme.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/include/libcxx/readme.txt b/system/include/libcxx/readme.txt
index ae8090fd..ccac2fcd 100644
--- a/system/include/libcxx/readme.txt
+++ b/system/include/libcxx/readme.txt
@@ -1 +1 @@
-These files are from libc++, svn revision 194185, 2013-11-07.
+These files are from libc++, svn revision 195693, 2013-11-26.