diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-02-13 13:58:01 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-02-13 13:58:01 -0800 |
| commit | c9be5fb89ebc7b45a22d3782f7f7da4ce8043ae2 (patch) | |
| tree | 7f9505d5cd7c9cd5e2be575870642a7b52362469 /AUTHORS | |
| parent | 73276eba9a84a109fbbe868bf9eecf30ba413556 (diff) | |
| parent | 273e88a86bb937860ba8bf7c3a49148694768701 (diff) | |
Merge branch 'prettier-shell' of github.com:TehEpicPineapple/emscripten into incoming
Conflicts:
AUTHORS
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -123,4 +123,6 @@ a license to everyone to use it as detailed in LICENSE.) * Boris Gjenero <boris.gjenero@gmail.com> * jonas echterhoff <jonas@unity3d.com> * Sami Vaarala <sami.vaarala@iki.fi> +* Jack A. Arrington <jack@epicpineapple.com> + |