diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-10-14 10:48:35 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-10-14 10:48:35 -0700 |
| commit | 92ca8c4c6d03f6e30f202a1b20f7a575aa385d31 (patch) | |
| tree | 945c1a2e4eb0446f91c22a02be52d226f67db022 /AUTHORS | |
| parent | 3c8c068617ea03fb8c1e884f570fbc986b9bf977 (diff) | |
| parent | c38633e9c324c6f38f54b96ec5a58058233fa9f2 (diff) | |
Merge branch 'glut_mouse_wheel' of github.com:anlambert/emscripten into incoming
Conflicts:
AUTHORS
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -100,3 +100,5 @@ a license to everyone to use it as detailed in LICENSE.) * Patrick R. Martin <patrick.martin.r@gmail.com> * Richard Quirk <richard.quirk@gmail.com> * Marcos Scriven <marcos@scriven.org> +* Antoine Lambert <antoine.lambert33@gmail.com> + |