Thomas Müller 4d8261fe0b Merge branch 'master' of https://github.com/ppy/osu into better-transforms ... # Conflicts: # osu-framework # osu.Game/Graphics/Cursor/OsuTooltipContainer.cs # osu.Game/Overlays/DragBar.cs		2017-07-18 15:16:02 +03:00
..
Sections	Merge branch 'master' into profile	2017-07-14 22:52:19 +08:00
SettingsCheckbox.cs	Change all instances of options to settings where applicable	2017-05-15 10:55:29 +09:00
SettingsDropdown.cs	Update namespaces in line with framework	2017-05-16 12:50:30 +09:00
SettingsEnumDropdown.cs	CI formatting	2017-05-19 19:22:42 -03:00
SettingsFooter.cs	Update namespaces in line with framework	2017-05-16 12:50:30 +09:00
SettingsHeader.cs	Move SearchTextBox out of SettingsHeader.	2017-05-21 04:12:16 +08:00
SettingsItem.cs	Update framework and fix compilation	2017-07-14 19:18:12 +03:00
SettingsLabel.cs	Change all instances of options to settings where applicable	2017-05-15 10:55:29 +09:00
SettingsSection.cs	Update framework and fix compilation	2017-07-14 19:18:12 +03:00
SettingsSlider.cs	Remove all unnecessary parenthesis where object initialisers are used	2017-07-13 15:11:33 +09:00
SettingsSubsection.cs	Update framework and fix compilation	2017-07-14 19:18:12 +03:00
SettingsTextBox.cs	Change all instances of options to settings where applicable	2017-05-15 10:55:29 +09:00
Sidebar.cs	Update framework and fix compilation	2017-07-14 19:18:12 +03:00
SidebarButton.cs	Shapes namespace	2017-06-20 15:54:23 +10:00