Dean Herbert 471b9daa93 Merge branch 'master' into mod-overlay ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/osu.Game.csproj		2017-03-02 20:27:04 +09:00
..
BeatmapDeleteDialog.cs	DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay	2017-02-28 02:09:36 -04:00
BeatmapInfoWedge.cs	FlowDirection -> FillDirection	2017-03-01 20:15:38 +01:00
CarouselContainer.cs	Merge remote-tracking branch 'upstream/master'	2017-02-27 14:55:44 +01:00
EditSongSelect.cs	GameMode -> Screen.	2017-02-17 19:23:58 +09:00
FilterControl.cs	Merge branch 'master' into master	2017-03-02 18:06:31 +09:00
Footer.cs	FlowDirection -> FillDirection	2017-03-01 20:15:38 +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	Merge branch 'master' into mod-overlay	2017-03-02 20:27:04 +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