diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-10-31 13:10:58 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-10-31 13:10:58 -0700 |
| commit | 90dcac551fee69cf284ae4431db949bc69796a1c (patch) | |
| tree | a15ccaaac95e1ae60527d7edbe8ff5857ee0a77a /AUTHORS | |
| parent | 92f9f71cba2781b72cf25a9c6e9dcb5e860a2dd9 (diff) | |
| parent | 5182542126a5ad3c40d958b0b72cfa16f4e8bd25 (diff) | |
Merge branch 'fixup-node-version-check' of github.com:bnoordhuis/emscripten into incoming
Conflicts:
AUTHORS
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -105,4 +105,5 @@ a license to everyone to use it as detailed in LICENSE.) * Remi Papillie <remi.papillie@gmail.com> * Fraser Adams <fraser.adams@blueyonder.co.uk> * Michael Tirado <icetooth333@gmail.com> +* Ben Noordhuis <info@bnoordhuis.nl> |