Zack Middleton 4837f4619e Merge branch 'master' into game/eliteforce ... Conflicts: code/client/cl_main.c code/qcommon/common.c code/qcommon/files.c code/qcommon/msg.c code/qcommon/q_shared.h code/renderercommon/tr_common.h code/renderergl2/tr_extensions.c code/sdl/sdl_glimp.c		2017-09-17 23:16:55 -05:00
..
sdl_gamma.c	Added SDL_GetError()	2015-07-26 15:45:21 +02:00
sdl_glimp.c	Reject OpenGL contexts w/ software renderer when core context requested.	2017-08-03 14:20:33 -07:00
sdl_icon.h	Use lily icon	2015-07-24 23:53:52 -05:00
sdl_input.c	Fix in_nograb not releasing the mouse cursor	2017-09-10 19:11:36 -05:00
sdl_snd.c	SDL_Init zero check	2015-07-24 22:56:00 +02:00