diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-03-03 14:10:55 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-03-03 14:10:55 -0800 |
| commit | 6ec190d3940cc2c115563ac924dc9a18325bf8c2 (patch) | |
| tree | 59895b9a082e20d072510ad72f0a72b3c08999b2 /AUTHORS | |
| parent | aca0e4d8b27f797d8bf3338e2032aa758d3fde98 (diff) | |
| parent | 168ec74a34743e3b2dc295ada9ccecbc689cf441 (diff) | |
Merge branch 'allow_multiple_worker_responses' of github.com:virusdave/emscripten into incoming
Conflicts:
AUTHORS
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -129,4 +129,5 @@ a license to everyone to use it as detailed in LICENSE.) * Haneef Mubarak <haneef503@gmail.com> * Nicolas Peri <nicox@shivaengine.com> (copyright owned by ShiVa Technologies, SAS) * Bernhard Fey <e-male@web.de> +* Dave Nicponski <dave.nicponski@gmail.com> |