aboutsummaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2014-02-12 11:59:59 -0800
committerAlon Zakai <alonzakai@gmail.com>2014-02-12 11:59:59 -0800
commit277ac5239057721ebe3c6e7813dc478eeab2cea0 (patch)
tree1491262d2f68487ece010c2d04dbcb47e6e2f4a0 /AUTHORS
parentf8cb7deeffa7c2bc79f938821759634e8dce0168 (diff)
parent881246b9028e68ee8caf0b738d360ed398812a57 (diff)
Merge branch 'regexp-syntax-fix' of github.com:svaarala/emscripten into incoming
Conflicts: AUTHORS
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS1
1 files changed, 1 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 9e01eb42..3c07256a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -122,4 +122,5 @@ a license to everyone to use it as detailed in LICENSE.)
* James S Urquhart <jamesu@gmail.com>
* Boris Gjenero <boris.gjenero@gmail.com>
* jonas echterhoff <jonas@unity3d.com>
+* Sami Vaarala <sami.vaarala@iki.fi>