Dean Herbert bdbe8501d3 Merge branch 'master' into add-flash-effects ... # Conflicts: # osu.Game/Overlays/Options/General/LoginOptions.cs		2017-01-30 21:47:05 +09:00
..
BeatmapInfoWedge.cs	Move BPM calculations to Beatmap.	2017-01-30 16:03:45 +09:00
CarouselContainer.cs	Adjust carousel radius slightly (flyte wanted it).	2017-01-30 16:55:47 +09:00
EditSongSelect.cs	Initial implementation of a beatmap carousell and various minor improvements to song select.	2016-11-20 20:34:16 +01:00
Footer.cs	Initial implementation of song select footer area.	2017-01-27 00:36:12 +09:00
FooterButton.cs	Initial implementation of song select footer area.	2017-01-27 00:36:12 +09:00
MatchSongSelect.cs	Initial implementation of a beatmap carousell and various minor improvements to song select.	2016-11-20 20:34:16 +01:00
PlaySongSelect.cs	Add StarDifficulty property and correct colouring of difficulty icons.	2017-01-30 15:26:28 +09:00