Thomas Müller d46e68b36b Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor ...

# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/Drawables/BeatmapGroup.cs

2017-03-01 18:05:58 +01:00

..

Sections

Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor

2017-03-01 18:05:58 +01:00

OptionDropDown.cs

Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor

2017-03-01 18:05:58 +01:00

OptionEnumDropDown.cs

Remove unnecessary using statements

2017-02-23 21:38:10 +01:00

OptionLabel.cs

Remove unnecessary using statements

2017-02-23 21:38:10 +01:00

OptionSlider.cs

Update References to FlowStrategies

2017-02-27 16:55:55 +01:00

OptionsSection.cs

Update References to FlowStrategies

2017-02-27 16:55:55 +01:00

OptionsSubsection.cs

Update References to FlowStrategies

2017-02-27 16:55:55 +01:00

OptionTextBox.cs

Removed redundant qualifiers

2017-02-27 17:37:38 +03:00

Sidebar.cs

Update References to FlowStrategies

2017-02-27 16:55:55 +01:00

SidebarButton.cs

Naming standardisation and enforcing.

2017-02-07 16:20:36 +09:00