aboutsummaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-02-26 20:28:38 -0500
committerAlon Zakai <alonzakai@gmail.com>2013-02-26 20:28:38 -0500
commit8d0c65454d6b15f4212b5c1809daa953295ce20d (patch)
tree270f54a0defc594ddd7667a8f156f86250b6b280 /AUTHORS
parentf4cceb902a31810215858393dd80c24ef62f6f15 (diff)
parent73f24426c1bdfd2ea9c6d42d8466bbdb42a6a092 (diff)
Merge branch 'incoming' of github.com:lptr/emscripten into lptr-incoming
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS1
1 files changed, 1 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index ef611d55..296d4150 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -51,4 +51,5 @@ a license to everyone to use it as detailed in LICENSE.)
* Michael Bishop <mbtyke@gmail.com>
* Roger Braun <roger@rogerbraun.net>
* Vladimir Vukicevic <vladimir@pobox.com> (copyright owned by Mozilla Foundation)
+* Lorant Pinter <lorant.pinter@prezi.com>