diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-01-07 17:43:36 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-01-07 17:43:36 -0800 |
| commit | 51980b34bf81095d01557253ac556dce7a7ff80f (patch) | |
| tree | 6b1a84e5815a275dcfbbd5db3f19f59c532fbd34 /AUTHORS | |
| parent | 9bf835df2c5284341ed8d20f89e7960bf91bb339 (diff) | |
| parent | 68d5248ff7152368c95a861560ecbb5c734ab1d7 (diff) | |
Merge remote-tracking branch 'wolfviking/incoming' into incoming
Conflicts:
AUTHORS
src/library_browser.js
system/include/emscripten/emscripten.h
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -43,4 +43,5 @@ a license to everyone to use it as detailed in LICENSE.) * Xuejie Xiao <xxuejie@gmail.com> * Dominic Wong <dom@slowbunyip.org> * Alan Kligman <alan.kligman@gmail.com> (copyright owned by Mozilla Foundation) +* Anthony Liot <wolfviking0@yahoo.com> |