Magnus Norddahl 42a7dbe33a Merge remote-tracking branch 'gzdoom/master' into qzdoom ... # Conflicts: # src/v_video.cpp		2017-02-19 03:49:13 +01:00
..
static	Merge remote-tracking branch 'gzdoom/master' into qzdoom	2017-02-19 03:49:13 +01:00
CMakeLists.txt	Establish QZDoom	2016-09-14 02:21:35 -04:00