diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-10-16 10:42:08 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-10-16 10:42:08 -0700 |
| commit | 86fe72e8bfdcf5e6518c7e615ce599d1c6c491dd (patch) | |
| tree | 53e56b4bb071578fbe409e3e21383dbb8a4df3f6 /AUTHORS | |
| parent | 9ca5fc4f2af23e78e8f44e89b5024588d0f57cf8 (diff) | |
| parent | c2ace4f8473ca8851be15d1f49f3f8bc2bb76ce5 (diff) | |
Merge branch 'antialiasing' of github.com:wsmind/emscripten into incoming
Conflicts:
AUTHORS
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -102,4 +102,5 @@ a license to everyone to use it as detailed in LICENSE.) * Marcos Scriven <marcos@scriven.org> * Antoine Lambert <antoine.lambert33@gmail.com> * Daniel Aquino <mr.danielaquino@gmail.com> +* Remi Papillie <remi.papillie@gmail.com> |