diff options
author | Alon Zakai <alonzakai@gmail.com> | 2013-10-16 10:44:11 -0700 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2013-10-16 10:44:11 -0700 |
commit | 9c98148da0a3888d1d3fcb52361ba2fe52718d20 (patch) | |
tree | 86c0cbf5cb7b8f085108fa21bc80c10cd6572fb1 /src | |
parent | 86fe72e8bfdcf5e6518c7e615ce599d1c6c491dd (diff) | |
parent | 0c7ec24c3f7c50d90d3b6f32c941115fc0610984 (diff) |
Merge branch 'fix-module-exports-with-closure-try2' of github.com:fadams/emscripten into incoming
Conflicts:
AUTHORS
tests/test_other.py
Diffstat (limited to 'src')
-rw-r--r-- | src/shell.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shell.js b/src/shell.js index 7bfbe781..be23b3c1 100644 --- a/src/shell.js +++ b/src/shell.js @@ -68,7 +68,7 @@ if (ENVIRONMENT_IS_NODE) { Module['arguments'] = process['argv'].slice(2); - module.exports = Module; + module['exports'] = Module; } else if (ENVIRONMENT_IS_SHELL) { Module['print'] = print; |