Mitchell Richters 5fc7c7b1d7 Merge branch 'master' into whaven ... # Conflicts: # source/CMakeLists.txt # source/build/include/buildtypes.h # source/common/utility/m_fixed.h # source/core/console/c_notifybuffer.cpp # source/core/gamecontrol.h # source/core/inputstate.cpp # source/core/version.h		2021-02-13 18:59:58 +11:00
..
music	- silenced some warnings.	2020-10-07 16:02:49 +02:00
sound	Merge branch 'master' into whaven	2021-02-13 18:59:58 +11:00