Christoph Oelckers 42d02834b1 Merge branch 'master' into newrenderer2 ... # Conflicts: # source/build/include/build.h # source/build/src/polymost.cpp # source/build/src/voxmodel.cpp # source/core/gamecontrol.cpp # source/core/gamestruct.h # source/games/blood/src/animatesprite.cpp # source/games/blood/src/misc.h # source/games/blood/src/view.cpp # source/games/duke/src/render.cpp # source/games/sw/src/draw.cpp # source/games/sw/src/game.h # source/games/sw/src/jsector.cpp # source/glbackend/glbackend.cpp		2021-04-11 14:38:56 +02:00
..
static	Merge branch 'master' into newrenderer2	2021-04-11 14:38:56 +02:00
CMakeLists.txt	- upgraded wadsrc/CMakeLists.txt	2021-03-15 08:38:31 +01:00