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
..
con_log.c	* Add con_log.c and con_passive.c from r1222 to quake3.vcproj.	2007-12-02 00:48:59 +00:00
con_passive.c	* Add con_log.c to log all console output	2007-11-30 18:32:52 +00:00
con_tty.c	Removed 0xAD character, from /dev/humancontroller.	2012-06-19 14:47:30 +00:00
con_win32.c	Fix win32 console partial print being overwritten	2013-01-10 16:29:54 -06:00
sys_loadlib.h	Don't search system directories for renderer lib	2011-08-01 09:33:48 +00:00
sys_local.h	Use SDL 2 instead of SDL 1.2	2013-01-17 18:20:03 +00:00
sys_main.c	Use SDL 2 instead of SDL 1.2	2013-01-17 18:20:03 +00:00
sys_osx.m	CVE-2012-3345	2012-06-14 18:28:58 +00:00
sys_unix.c	5717 - Gamecode can open file "" for reading	2013-02-15 21:08:47 -06:00
sys_win32.c	Merge branch 'master' into sdl2	2013-05-08 14:27:15 +01:00
win_resource.h	* Merge unified-sdl to trunk	2007-09-05 18:17:46 +00:00
win_resource.rc	* Fix to win_resource.rc for MSVC build	2007-11-03 21:53:50 +00:00