Magnus Norddahl 2848ca53dc Merge remote-tracking branch 'gzdoom/master' into qzdoom ... # Conflicts: # src/r_things.cpp # src/r_things.h		2017-01-16 23:05:34 +01:00
..
static	Merge remote-tracking branch 'gzdoom/master' into qzdoom	2017-01-16 23:05:34 +01:00
CMakeLists.txt	Establish QZDoom	2016-09-14 02:21:35 -04:00