Tim Angus 2a3368481d Merge branch 'master' into sdl2 ... Conflicts: Makefile code/renderergl2/tr_image.c		2014-08-25 15:00:48 +01:00
..
sdl_gamma.c	Merge branch 'master' into sdl2	2013-05-08 14:27:15 +01:00
sdl_glimp.c	Fix multisampling on X11	2014-03-17 12:24:59 -05:00
sdl_icon.h	Reverting.	2008-07-06 17:16:14 +00:00
sdl_input.c	Merge branch 'master' into sdl2	2014-08-25 15:00:48 +01:00
sdl_snd.c	Use SDL 2 instead of SDL 1.2	2013-01-17 18:20:03 +00:00