smoogipoo 4086ff7313 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change ... # Conflicts: # osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs # osu.Game/Screens/Menu/Intro.cs # osu.Game/Screens/Menu/MenuSideFlashes.cs		2018-06-06 18:26:51 +09:00
..
Carousel	Fix player getting loaded when exiting song select	2018-05-30 15:48:20 +09:00
Details	Make BeatmapSetOverlay accept nulls everywhere	2018-04-18 16:42:09 +09:00
Filter	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Leaderboards	Add tooltip to ScoreComponentLabel.	2018-06-03 22:26:30 -03:00
Options	Normalize all the line endings	2018-04-13 18:26:38 +09:00
BeatmapCarousel.cs	Changes to naming and text	2018-04-18 19:47:13 +09:00
BeatmapDeleteDialog.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
BeatmapDetailArea.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
BeatmapDetailAreaTabControl.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
BeatmapDetails.cs	Set 'Colour' when creating 'textFlow'	2018-06-03 17:41:34 -07:00
BeatmapInfoWedge.cs	Fix incorrect async logic in BeatmapInfoWedge	2018-06-01 20:31:29 +09:00
EditSongSelect.cs	Fix player getting loaded when exiting song select	2018-05-30 15:48:20 +09:00
FilterControl.cs	Allow drag clicking footer and filter on song select	2018-05-20 20:25:39 -07:00
FilterCriteria.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Footer.cs	Allow drag clicking footer and filter on song select	2018-05-20 20:25:39 -07:00
FooterButton.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
ImportFromStablePopup.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
MatchSongSelect.cs	Fix player getting loaded when exiting song select	2018-05-30 15:48:20 +09:00
PlaySongSelect.cs	Merge branch 'master' into disallow-beatmap-change	2018-06-04 10:53:04 +09:00
SongSelect.cs	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change	2018-06-06 18:26:51 +09:00
WedgeBackground.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00