diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-05-09 12:01:58 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-05-09 12:01:58 -0700 |
| commit | d59c69f2541240a700d0c03f22dc334314ad98c6 (patch) | |
| tree | 4f3c73f60f70823c59d2d41cb5363fc63351e9ca /AUTHORS | |
| parent | 953484e4cf3e93fc3bf5fdb4e6e7a438299162cc (diff) | |
| parent | 5123418c4a37b67309e4be386ee12ccd5ea36c8c (diff) | |
Merge branch 'incoming' of github.com:mgerhardy/emscripten into mgerhardy-incoming
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -74,5 +74,6 @@ a license to everyone to use it as detailed in LICENSE.) * Tom Fairfield <fairfield@cs.xu.edu> * Anthony J. Thibault <ajt@hyperlogic.org> * John Allwine <jallwine86@gmail.com> +* Martin Gerhardy <martin.gerhardy@gmail.com> |