diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-06-04 15:46:59 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-06-04 15:46:59 -0700 |
| commit | 98ba79568b89306ab1670382b432dd6f69e64615 (patch) | |
| tree | d8ad2e5a0387737a6ac013515adf3831dac0df53 /AUTHORS | |
| parent | 9645ed34f1003f03970ba3c49a82a3c550a07bac (diff) | |
| parent | 9226578fa142134973e3ad5544c22cb954ea0cc2 (diff) | |
Merge branch 'master' of github.com:feeley/emscripten into incoming
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -81,4 +81,5 @@ a license to everyone to use it as detailed in LICENSE.) * Frits Talbot <frits@metapathy.com> * Onno Jongbloed <hey@onnoj.net> * Jez Ng <me@jezng.com> +* Marc Feeley <mfeeley@mozilla.com> (copyright owned by Mozilla Foundation) |