diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-11-21 17:28:16 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-11-21 17:28:16 -0800 |
| commit | 14db7d55d2ee01944d47a12bccb83b918f152d22 (patch) | |
| tree | d2bb6c80047d421a7ef68edda051d6ad2f496e8a /AUTHORS | |
| parent | ae48758800aab7bdc442988a7472b590f7f62e71 (diff) | |
| parent | 476e974d664e73013e37e85eb8ed8e9ddc7f9213 (diff) | |
Merge branch 'fix_whitespace' of github.com:DanielBaulig/emscripten into incoming
Conflicts:
AUTHORS
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -108,3 +108,5 @@ a license to everyone to use it as detailed in LICENSE.) * Ben Noordhuis <info@bnoordhuis.nl> * Bob Roberts <bobroberts177@gmail.com> * John Vilk <jvilk@cs.umass.edu> +* Daniel Baulig <dbaulig@fb.com> (copyright owned by Facebook, Inc.) + |