Christoph Oelckers 7ba152e588 Merge branch 'master' into whaven ... # Conflicts: # source/core/gameinput.h # source/core/version.h # source/games/exhumed/src/enginesubs.cpp # source/games/sw/src/game.cpp		2021-11-12 11:19:23 +01:00
..
music	- removed templates.h includes.	2021-10-30 10:51:03 +02:00
sound	Merge branch 'master' into whaven	2021-11-12 11:19:23 +01:00