Christoph Oelckers 6373b75d22 Merge branch 'master' into powerslave ... # Conflicts: # source/common/gamecontrol.cpp # source/common/version.h # wadsrc/static/engine/grpinfo.txt		2019-12-26 14:46:14 +01:00
..
static	Merge branch 'master' into powerslave	2019-12-26 14:46:14 +01:00
CMakeLists.txt	- added an engine resource file.	2019-10-04 23:29:00 +02:00