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
..
Audio	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
Gameplay	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
General	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
Graphics	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
Input	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
Online	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
CheckBoxOption.cs	Fix checkbox not updating correctly.	2016-11-09 20:13:13 +09:00
EditorSection.cs	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
MaintenanceSection.cs	Add expanding options sidebar	2016-11-08 23:36:06 -05:00
OptionsSection.cs	Add expanding options sidebar	2016-11-08 23:36:06 -05:00
OptionsSidebar.cs	Add expanding options sidebar	2016-11-08 23:36:06 -05:00
OptionsSubsection.cs	Wire up all of the boolean options	2016-11-08 23:17:08 -05:00
SkinSection.cs	Merge branch 'refs/heads/master' into dependency-injection	2016-11-12 20:18:26 +09:00
TextBoxOption.cs	s/internalText/InternalText/g	2016-11-10 18:25:20 -05:00