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
Footer.cs
FooterButton.cs
MatchSongSelect.cs
PlaySongSelect.cs	Add StarDifficulty property and correct colouring of difficulty icons.	2017-01-30 15:26:28 +09:00