diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-04-22 10:25:51 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-04-22 10:25:51 -0700 |
| commit | b6834b7094c52fbca9193154d4148f6ff79e18a5 (patch) | |
| tree | 4c635447a7d5221f1e938baf77dd1f15d4d08b8e /AUTHORS | |
| parent | 326078dbfd2d1b412546dffef81964c3d2ca125d (diff) | |
| parent | fd9e8330eafcdb9112753ed6729954605f357280 (diff) | |
Merge branch 'incoming' of github.com:guillaumeblanc/emscripten into incoming
Conflicts:
AUTHORS
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -135,4 +135,6 @@ a license to everyone to use it as detailed in LICENSE.) * Dan Dascalescu <dNOSPAMdascalescu@gmail.com> * Thomas Borsos <thomasborsos@gmail.com> * Ori Avtalion <ori@avtalion.name> +* Guillaume Blanc <guillaumeblanc.sc@gmail.com> + |