Christoph Oelckers a93ed1e502 Merge branch 'master' into back_to_basics2 ... # Conflicts: # source/blood/src/view.cpp # source/core/gamecontrol.cpp		2020-07-14 12:57:38 +02:00
..
blood	Merge branch 'master' into back_to_basics2	2020-07-14 12:57:38 +02:00
build
common	Merge branch 'master' into back_to_basics2	2020-07-14 12:57:38 +02:00
core	Merge branch 'master' into back_to_basics2	2020-07-14 12:57:38 +02:00
duke3d
exhumed
games/duke
glbackend
libsmackerdec
platform
rr
sw
thirdparty
__autostart.cpp
CMakeLists.txt
g_pch.h
gitinfo.cpp
zzautozend.cpp