Christoph Oelckers cc1241a4b8 Merge branch 'make-qzdoom-gzdoom-again' of https://github.com/raa-eruanna/qzdoom into 3.0_work ... # Conflicts: # src/win32/win32gliface.h # src/win32/win32iface.h This compiles but no guarantees otherwise.		2017-03-09 19:09:13 +01:00
..
static	Merge branch 'make-qzdoom-gzdoom-again' of https://github.com/raa-eruanna/qzdoom into 3.0_work	2017-03-09 19:09:13 +01:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00