Christoph Oelckers 333581a084 Merge branch 'master' into newrenderer2 ... # Conflicts: # source/build/src/defs.cpp		2021-04-09 19:57:56 +02:00
..
static	Merge branch 'master' into newrenderer2	2021-04-09 19:57:56 +02:00
CMakeLists.txt	- upgraded wadsrc/CMakeLists.txt	2021-03-15 08:38:31 +01:00