Magnus Norddahl 1d941c9839 Merge remote-tracking branch 'gzdoom/master' into qzdoom ... # Conflicts: # src/r_plane.cpp # src/win32/zdoom.rc		2017-01-13 13:21:10 +01:00
..
static	Merge remote-tracking branch 'gzdoom/master' into qzdoom	2017-01-13 13:21:10 +01:00
CMakeLists.txt	Establish QZDoom	2016-09-14 02:21:35 -04:00