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
..
BeatmapBackgroundSprite.cs	Fix some nullrefs when running visualtests with no maps loaded.	2017-01-27 00:16:02 +09:00
BeatmapGroup.cs	Hook up icons better.	2017-01-30 13:35:40 +09:00
BeatmapPanel.cs	Merge branch 'master' into add-flash-effects	2017-01-30 21:47:05 +09:00
BeatmapSetHeader.cs	Hook up icons better.	2017-01-30 13:35:40 +09:00
DifficultyIcon.cs	Add StarDifficulty property and correct colouring of difficulty icons.	2017-01-30 15:26:28 +09:00
Panel.cs	Refactor colors to palette based design	2017-01-12 16:38:27 -05:00