* some SDL functions from SDL1.x and SDL2.x
Merge branch 'incoming' of github.com:mgerhardy/emscripten into incoming

Conflicts:
	src/library_sdl.js