diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-05-12 11:39:17 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-05-12 11:39:17 -0700 |
| commit | 0edf2a8c95724ffcb89f01fb65c2331eea8b9248 (patch) | |
| tree | e16e0d219844ec04fcfd267e15048cec38c492a3 /emscripten-version.txt | |
| parent | d3e3d803adce646cf169bdb361bb366c0712f598 (diff) | |
| parent | 366d0ec788a0847e2513c74c3c35e1f3807741c4 (diff) | |
Merge branch 'sdl_mouse_wheel' of github.com:jechter/emscripten into incoming1.18.1
Conflicts:
emscripten-version.txt
Diffstat (limited to 'emscripten-version.txt')
| -rw-r--r-- | emscripten-version.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/emscripten-version.txt b/emscripten-version.txt index a36c9a1e..6cee04e0 100644 --- a/emscripten-version.txt +++ b/emscripten-version.txt @@ -1,2 +1,2 @@ -1.18.0 +1.18.1 |