Christoph Oelckers 82194bbf6b Merge branch 'master' into newrenderer ... # Conflicts: # source/games/exhumed/src/2d.cpp		2021-04-17 13:22:30 +02:00
..
data
postprocessing
hw_draw2d.cpp	- cleaned up the screen job's fade handling, now that the jobs no longer depend on an external timer.	2021-04-16 21:27:54 +02:00