Tim Angus d9d52f0306 Merge branch 'master' into sdl2 ...

Conflicts:
	Makefile
	code/renderercommon/qgl.h
	code/renderergl1/tr_local.h
	code/sdl/sdl_glimp.c

2013-05-08 14:27:15 +01:00

..

sdl_gamma.c

Merge branch 'master' into sdl2

2013-05-08 14:27:15 +01:00

sdl_glimp.c

Merge branch 'master' into sdl2

2013-05-08 14:27:15 +01:00

sdl_icon.h

Reverting.

2008-07-06 17:16:14 +00:00

sdl_input.c

Improve console key situation

2013-01-21 22:20:15 +00:00

sdl_snd.c

Use SDL 2 instead of SDL 1.2

2013-01-17 18:20:03 +00:00