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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/shared.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/shared.py b/tools/shared.py index efca1a85..32f8f797 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -345,7 +345,7 @@ def find_temp_directory(): # we re-check sanity when the settings are changed) # We also re-check sanity and clear the cache when the version changes -EMSCRIPTEN_VERSION = '1.8.7' +EMSCRIPTEN_VERSION = '1.8.8' def generate_sanity(): return EMSCRIPTEN_VERSION + '|' + get_llvm_target() + '|' + LLVM_ROOT + '|' + get_clang_version() |