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
..
GeneralSection.cs	Add expanding options sidebar	2016-11-08 23:36:06 -05:00
LanguageOptions.cs	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
LoginOptions.cs	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
UpdateOptions.cs	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00