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
..
BeatmapInfoWedge.cs	Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor	2017-03-01 18:05:58 +01:00
CarouselContainer.cs	Update framework	2017-02-26 11:22:58 +09:00
EditSongSelect.cs	GameMode -> Screen.	2017-02-17 19:23:58 +09:00
FilterControl.cs	Update References to FlowStrategies	2017-02-27 16:55:55 +01:00
Footer.cs	Update References to FlowStrategies	2017-02-27 16:55:55 +01:00
FooterButton.cs	Update framework	2017-02-26 11:22:58 +09:00
MatchSongSelect.cs	GameMode -> Screen.	2017-02-17 19:23:58 +09:00
PlaySongSelect.cs	Update framework	2017-02-26 11:22:58 +09:00
SearchTextBox.cs	SearchTextBox should not handle shift-delete.	2017-02-24 11:44:40 +09:00
WedgeBackground.cs	Handle toolbar offsets better.	2017-02-08 20:30:45 +09:00