Christoph Oelckers 8e5b9111bd Merge branch 'master' into powerslave ... # Conflicts: # source/CMakeLists.txt		2019-12-27 15:34:09 +01:00
..
blood	- replaced all uses of Bfree with Xfree so they are subjected to debug instrumentation, uses FStrings in a few cases where it made sense.	2019-12-26 14:43:44 +01:00
build	Merge branch 'master' into powerslave	2019-12-26 14:46:14 +01:00
common	Merge branch 'master' into powerslave	2019-12-27 15:34:09 +01:00
duke3d	- renamed the internal resource directory to "engine" and routed most literal mentions of the engine name through version.h	2019-12-26 14:04:53 +01:00
exhumed	- work on the savegame writer.	2019-12-27 10:52:40 +01:00
glbackend	- Exhumed menu tweaks - draw a background and caption for the option menus the game originally did not have.	2019-12-26 17:42:45 +01:00
libsmackerdec	- replaced all uses of Bfree with Xfree so they are subjected to debug instrumentation, uses FStrings in a few cases where it made sense.	2019-12-26 14:43:44 +01:00
platform	- gave .natvis file a neutral name.	2019-12-27 13:39:30 +01:00
rr	Merge branch 'master' into powerslave	2019-12-26 14:46:14 +01:00
sw	- savegame name generation fix for SW.	2019-12-27 10:54:00 +01:00
thirdparty
CMakeLists.txt	Merge branch 'master' into powerslave	2019-12-27 15:34:09 +01:00
g_pch.h
gitinfo.cpp