Merge branch 'empar' into incoming
Merge branch 'SDL_OpenAudio' into incoming
Merge branch 'SDL_SetVideoMode' into incoming
Merge branch 'incoming' of github.com:kripken/emscripten into incoming
Merge branch 'incoming' of github.com:kripken/emscripten into incoming
Merge branch 'incoming' of github.com:kripken/emscripten into incoming
check for existing /dev folder before creating
* some SDL2 stuff
* more SDL2 stuff
* SDL_GL_ExtensionSupported: fixed integer value

* added myself to the AUTHORS file
Merge pull request #1137 from mnaamani/networking

check for existing /dev folder before creating
Merge branch 'incoming' of github.com:kripken/emscripten into incoming
Merge branch 'SDL_OpenAudio' into incoming
add nbody-java code
add nbody-java benchmark
include netinet/in.h in netdb.h, like linux does; fixes #1153
Issue #1134: scanf does not treat CR, FF, VT as whitespace
Add support for skipping all modes of a single test with 'python tests/runner.py skip:ALL.test_freetype', instead of having to specify all the modes for the test to be skipped by hand.
Remove the __native_client__ system define when using NaCl triple. Emscripten does not implement Google Native Client/Pepper APIs.
Remove __pnacl__ #define as well.