diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2012-03-29 22:43:11 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2012-03-29 22:43:11 -0700 |
| commit | fa8b668639e9c9656a6efa0c5ff24d33e33a9f5a (patch) | |
| tree | 341221d47dcff6c36c56877b97886c957cf7c7a1 | |
| parent | 8833fc409ccec5339cfbc6f6fb2bd2af6835cae0 (diff) | |
| parent | 8d29314585e2f7f36e97612ba2877f2a94c41a86 (diff) | |
Merge branch 'incoming' of github.com:kripken/emscripten into incoming
| -rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -16,3 +16,4 @@ under the licensing terms detailed in LICENSE. * Adrian Taylor <adrian@macrobug.com> * Richard Assar <richard.assar@gmail.com> * Nathan Hammond <emscripten@nathanhammond.com> +* Behdad Esfahbod <behdad@behdad.org> |