diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-01-13 16:55:19 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-01-13 16:56:03 -0800 |
| commit | cd1edebb5034ea52396a5b68304e84ae80878740 (patch) | |
| tree | 6a6f8364ea74985d11c4f6ff74e5b80e08dc849d /system/lib/libcxx/new.cpp | |
| parent | af59788f8b7b76515e36bee1bf66edf497b801db (diff) | |
| parent | 2914deb17f3857bb02eeec87a58a3ed6d4a8853a (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/lib/libcxx/new.cpp')
| -rw-r--r-- | system/lib/libcxx/new.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/lib/libcxx/new.cpp b/system/lib/libcxx/new.cpp index fa0331a8..f4998cfb 100644 --- a/system/lib/libcxx/new.cpp +++ b/system/lib/libcxx/new.cpp @@ -22,7 +22,7 @@ #ifndef _LIBCPPABI_VERSION // On Darwin, there are two STL shared libraries and a lower level ABI - // shared libray. The global holding the current new handler is + // shared library. The global holding the current new handler is // in the ABI library and named __cxa_new_handler. #define __new_handler __cxxabiapple::__cxa_new_handler #endif |