diff options
author | Alon Zakai <alonzakai@gmail.com> | 2014-02-12 11:59:59 -0800 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2014-02-12 11:59:59 -0800 |
commit | 277ac5239057721ebe3c6e7813dc478eeab2cea0 (patch) | |
tree | 1491262d2f68487ece010c2d04dbcb47e6e2f4a0 /AUTHORS | |
parent | f8cb7deeffa7c2bc79f938821759634e8dce0168 (diff) | |
parent | 881246b9028e68ee8caf0b738d360ed398812a57 (diff) |
Merge branch 'regexp-syntax-fix' of github.com:svaarala/emscripten into incoming
Conflicts:
AUTHORS
Diffstat (limited to 'AUTHORS')
-rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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> |