Dean Herbert 4e4408cd20 Merge branch 'master' into replay ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs		2017-03-05 17:45:03 +09:00
..
ComboCounter.cs	Update framework	2017-02-26 11:22:58 +09:00
ComboResultCounter.cs	Update framework	2017-02-26 11:22:58 +09:00
HealthDisplay.cs	Use Color4Extensions from Framework and remove redundant Name	2017-03-04 19:42:37 +01:00
HitRenderer.cs	Basic partial replay support.	2017-03-01 22:04:20 +09:00
ModIcon.cs	Added mod selection overlay	2017-02-16 16:05:03 -04:00
Playfield.cs	Basic partial replay support.	2017-03-01 22:04:20 +09:00
ScoreOverlay.cs	Triggering fix	2017-03-01 13:36:53 +03:00