Christoph Oelckers 68c97e3c25 Merge branch 'master' of https://github.com/coelckers/Raze ... # Conflicts: # source/core/gamecontrol.h # source/duke3d/src/game.cpp # source/exhumed/src/exhumed.cpp # source/rr/src/game.cpp		2020-05-31 23:30:10 +02:00
..
music	Merge branch 'master' of https://github.com/coelckers/Raze	2020-05-31 23:30:10 +02:00
sound	- backend sync with GZDoom to pull in a few bugfixes and formatting corrections.	2020-05-26 23:12:04 +02:00