Damnae 2c245f4c22 Merge branch 'master' into storyboard_integration ... # Conflicts: # osu.Game/Configuration/OsuConfigManager.cs # osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs		2017-09-22 12:45:34 +02:00
..
Sections	Merge branch 'master' into storyboard_integration	2017-09-22 12:45:34 +02:00
SettingsCheckbox.cs	…
SettingsDropdown.cs	…
SettingsEnumDropdown.cs	…
SettingsFooter.cs	Use new static IsDebug method	2017-09-19 16:07:00 +09:00
SettingsHeader.cs	Make settings more modular	2017-08-14 13:09:59 +09:00
SettingsItem.cs	Changed type of IHasFilterTerms.FilterTerms according to framework update	2017-09-13 16:18:02 +02:00
SettingsLabel.cs	…
SettingsSection.cs	Changed type of IHasFilterTerms.FilterTerms according to framework update	2017-09-13 16:18:02 +02:00
SettingsSlider.cs	Remove all unnecessary parenthesis where object initialisers are used	2017-07-13 15:11:33 +09:00
SettingsSubsection.cs	Changed type of IHasFilterTerms.FilterTerms according to framework update	2017-09-13 16:18:02 +02:00
SettingsTextBox.cs	…
Sidebar.cs	Update in-line with framework changes.	2017-09-04 09:32:35 +09:00
SidebarButton.cs	Update in line with framework changes.	2017-09-07 22:46:21 +09:00