Christoph Oelckers b8fd41a58f Merge master into whaven ... # Conflicts: # source/core/gamecontrol.h		2021-03-15 10:42:59 +01:00
..
music	- disable the player specific volume modifiers if replay gain is enabled.	2021-03-14 09:05:28 +01:00
sound	Merge master into whaven	2021-03-15 10:42:59 +01:00