aboutsummaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-04-08 20:16:44 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-04-08 20:16:44 -0700
commit11f19e615c6046751c3a578e67ca027cfaf55367 (patch)
tree982353ab29bc497367a359686d6656b72d1cfa52 /AUTHORS
parenteb50cbdde56761b31ce57f38557da769297b76ec (diff)
parent1c4c4816b7030b1071ede7bf6d794f0cd65b391b (diff)
Merge pull request #1039 from juj/no_emcc_exe
No emcc exe
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS7
1 files changed, 4 insertions, 3 deletions
diff --git a/AUTHORS b/AUTHORS
index d7b146e1..55a7c057 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -24,7 +24,7 @@ a license to everyone to use it as detailed in LICENSE.)
* Pierre Renaux <pierre@talansoft.com>
* Brian Anderson <banderson@mozilla.com>
* Jon Bardin <diclophis@gmail.com>
-* Jukka Jylänki <jujjyl@gmail.com>
+* Jukka Jylänki <jujjyl@gmail.com>
* Aleksander Guryanov <caiiiycuk@gmail.com>
* Chad Austin <chad@chadaustin.me> (copyright owned by IMVU)
* nandhp <nandhp@gmail.com>
@@ -46,7 +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>
+* Manuel Schölling <manuel.schoelling@gmx.de>
* Bruce Mitchener, Jr. <bruce.mitchener@gmail.com>
* Michael Bishop <mbtyke@gmail.com>
* Roger Braun <roger@rogerbraun.net>
@@ -55,8 +55,9 @@ a license to everyone to use it as detailed in LICENSE.)
* Tobias Doerffel <tobias.doerffel@gmail.com>
* Martin von Gagern <martin@von-gagern.net>
* Ting-Yuan Huang <thuang@mozilla.com>
+* Joshua Granick <jgranick@blackberry.com>
* Felix H. Dahlke <fhd@ubercode.de>
-* Éloi Rivard <azmeuk@gmail.com>
+* Éloi Rivard <azmeuk@gmail.com>
* Alexander Gladysh <ag@logiceditor.com>
* Arlo Breault <arlolra@gmail.com>