Dean Herbert cc0f61f545 Merge branch 'refs/heads/master' into dependency-injection ... # Conflicts: # osu-framework # osu.Game/GameModes/OsuGameMode.cs # osu.Game/GameModes/Play/Player.cs # osu.Game/OsuGame.cs # osu.Game/Overlays/MusicController.cs # osu.Game/Overlays/Options/EditorSection.cs # osu.Game/Overlays/Options/Input/MouseOptions.cs # osu.Game/Overlays/Options/Online/InGameChatOptions.cs # osu.Game/Overlays/Options/SkinSection.cs		2016-11-12 20:18:26 +09:00
..
AudioDevicesOptions.cs	Wire up all of the boolean options	2016-11-08 23:17:08 -05:00
AudioSection.cs	Merge pull request #159 from SirCmpwn/platform-options	2016-11-12 16:05:47 +09:00
OffsetAdjustmentOptions.cs	Wire up all of the boolean options	2016-11-08 23:17:08 -05:00
VolumeOptions.cs	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00