diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-03-24 14:04:16 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-03-24 14:04:16 -0700 |
| commit | 1762d5adba1916625c9158592d16085bd6a3b8e3 (patch) | |
| tree | 482911dff64f56d2fd71f9e144cd67eeed02cf18 | |
| parent | 44bec89cef50420ab6e52efcf114c200b0023be7 (diff) | |
| parent | 45a98fe1eac333190261c4ea7c4ab1b16c8cb9ea (diff) | |
Merge branch 'patch-2' of github.com:dandv/emscripten into incoming
Conflicts:
AUTHORS
| -rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -132,4 +132,5 @@ a license to everyone to use it as detailed in LICENSE.) * Dave Nicponski <dave.nicponski@gmail.com> * Jonathan Jarri <noxalus@gmail.com> * Daniele Di Proietto <daniele.di.proietto@gmail.com> +* Dan Dascalescu <dNOSPAMdascalescu@gmail.com> |