Dean Herbert d05b544d0d Merge branch 'master' into audio-device-selection ... # Conflicts: # osu-framework # osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs		2017-02-09 16:21:28 +09:00
..
Sections	Merge branch 'master' into audio-device-selection	2017-02-09 16:21:28 +09:00
OptionDropDown.cs	Merge branch 'master' into audio-device-selection	2017-02-09 16:21:28 +09:00
OptionEnumDropDown.cs	…
OptionLabel.cs	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
OptionSlider.cs	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
OptionTextBox.cs	Use new placeholder logic.	2017-02-08 14:08:01 +09:00
OptionsSection.cs	Naming standardisation and enforcing.	2017-02-07 16:20:36 +09:00
OptionsSubsection.cs	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
Sidebar.cs	Centralise toolbar size variables and adjust to design.	2017-02-08 20:30:45 +09:00
SidebarButton.cs	Naming standardisation and enforcing.	2017-02-07 16:20:36 +09:00