diff options
| author | Jez Ng <me@jezng.com> | 2013-06-22 22:14:31 -0700 |
|---|---|---|
| committer | Jez Ng <me@jezng.com> | 2013-06-22 23:46:31 -0700 |
| commit | 7ff0dde7802ca3596457d3b15ece6949ed380a15 (patch) | |
| tree | e783289f86dca3b2c8970108773175ee97a67173 /tools/shared.py | |
| parent | 2b54c4f9164df8e7aced49930926589f7524de42 (diff) | |
| parent | c001e260ef766875fba65ae1f9848cfe6add90c7 (diff) | |
Merge remote-tracking branch 'upstream/incoming' into source-maps
Conflicts:
emcc
tools/js-optimizer.js
tools/js_optimizer.py
Diffstat (limited to 'tools/shared.py')
| -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 89ceeccb..64ffe29f 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -295,7 +295,7 @@ def check_node_version(): # 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.5.0' +EMSCRIPTEN_VERSION = '1.5.1' def generate_sanity(): return EMSCRIPTEN_VERSION + '|' + get_llvm_target() |