aboutsummaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-07-21 12:12:14 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-07-21 12:12:14 -0700
commit847b24e95988772dc8e729e73a7e7ae2a0cc87f1 (patch)
treedaca75e4b8bb6505830bb7cd1915ec1aaa84bb0e /AUTHORS
parent944142e8b35c8d78c4742314040ca867b31f7e44 (diff)
parentcba86931988b555b954d284c70b868a46d8f8f66 (diff)
Merge branch 'isgraph' of github.com:ToadKing/emscripten into incoming
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS2
1 files changed, 2 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 9ff060e7..ea4c8f0b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -89,3 +89,5 @@ a license to everyone to use it as detailed in LICENSE.)
* Douglas T. Crosher <dtc-moz@scieneer.com> (copyright owned by Mozilla Founcation)
* Soeren Balko <soeren.balko@gmail.com>
* Ryan Kelly (ryan@rfk.id.au)
+* Michael Lelli <toadking@toadking.com>
+