aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2014-05-09 16:32:02 -0700
committerAlon Zakai <alonzakai@gmail.com>2014-05-09 16:32:02 -0700
commitd7f091b6eed76427ae337404a5fc75c03a9fd3ad (patch)
tree6b5cd3c8551012a52c4ba4f05144be94da84fc58
parent0db5dc3a0df36251eac3ea8ad6bf852acb2f819d (diff)
parent2512fbe3cc472cbfbe1df21205b1f0732c7397c5 (diff)
Merge branch 'incoming'HEADmaster
-rw-r--r--emscripten-version.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/emscripten-version.txt b/emscripten-version.txt
index f9505a5cdc..a36c9a1e08 100644
--- a/emscripten-version.txt
+++ b/emscripten-version.txt
@@ -1,2 +1,2 @@
-1.17.0
+1.18.0