Christoph Oelckers 198fbf9297 Merge branch 'master' into whaven ... # Conflicts: # source/core/screenjob.cpp # source/core/searchpaths.cpp		2021-06-03 08:52:19 +02:00
..
static	Merge branch 'master' into whaven	2021-06-03 08:52:19 +02:00
CMakeLists.txt	- upgraded wadsrc/CMakeLists.txt	2021-03-15 08:38:31 +01:00