diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-01-19 09:50:16 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-01-19 09:50:39 -0800 |
| commit | 35cbbe82edf2173092592244aa342285fbcb5e44 (patch) | |
| tree | f9e40d77a363b183c116cd7fdd263facf1776631 /AUTHORS | |
| parent | 6c32b689d351683b9a823ef83bef51aca0a8014b (diff) | |
| parent | ee67164cc8238b52a77a47ee4efca934ffdcbba7 (diff) | |
Merge branch 'incoming' of https://github.com/manuels/emscripten into incoming
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -46,3 +46,7 @@ a license to everyone to use it as detailed in LICENSE.) * Anthony Liot <wolfviking0@yahoo.com> * Michael Riss <Michael.Riss@gmx.de> * Jasper St. Pierre <jstpierre@mecheye.net> +* Manuel Schölling <manuel.schoelling@gmx.de> + + + |