Christoph Oelckers 82194bbf6b Merge branch 'master' into newrenderer ... # Conflicts: # source/games/exhumed/src/2d.cpp		2021-04-17 13:22:30 +02:00
..
src	Merge branch 'master' into newrenderer	2021-04-17 13:22:30 +02:00
all.cpp	- project cleanup	2021-01-10 20:31:32 +01:00