Use SDL 2 instead of SDL 1.2
Make the mousewheel work
Allow hardware gamma, in theory
Convert SDL text input to UTF-32
Fix wacky patch for r_ignorehwgamma
Improve console key situation
Update bundled SDL headers/libs
The in_mouse stuff makes no sense in SDL2
Merge branch 'master' into sdl2

Conflicts:
	Makefile
	code/renderercommon/qgl.h
	code/renderergl1/tr_local.h
	code/sdl/sdl_glimp.c
Merge remote-tracking branch 'timangus/sdl2' into sdl2

Conflicts:
	Makefile
	code/renderercommon/qgl.h
	code/renderergl1/tr_local.h
	code/sdl/sdl_glimp.c
	code/sdl/sdl_input.c
Merge branch 'master' into sdl2
Try to fix building using travis-ci
Merge branch 'master' into sdl2
Merge branch 'master' into sdl2
Merge branch 'master' into sdl2

Conflicts:
	code/sdl/sdl_input.c
SDL2 libs for OSX, thanks to MAN-AT-ARMS
Update prebuilt SDL2 libs for Windows
More updates to SDL2 libs from MAN-AT-ARMS
Update SDL2 headers... oops
Merge branch 'master' into sdl2

Conflicts:
	code/sdl/sdl_glimp.c