Christoph Oelckers dbf0a68b02 Merge commit '67e3106254' ... # Conflicts: # src/doomdata.h # src/namedef.h # src/p_udmf.cpp		2018-01-20 19:07:54 +01:00
..
static	Merge commit '67e3106254'	2018-01-20 19:07:54 +01:00
CMakeLists.txt	- missed one qzdoom reference	2017-07-20 06:45:08 -04:00