Dean Herbert 14b22445fa Merge remote-tracking branch 'upstream/master' into general-fixes ... # Conflicts: # osu.Game/Modes/UI/HitRenderer.cs		2017-03-14 16:15:26 +09:00
..
ComboCounter.cs	Combo should not be longs.	2017-03-10 16:05:05 +09:00
ComboResultCounter.cs	More bindables!	2017-03-10 13:49:51 +09:00
HealthDisplay.cs	More general refactorings.	2017-03-10 14:42:14 +09:00
HitRenderer.cs	Merge remote-tracking branch 'upstream/master' into general-fixes	2017-03-14 16:15:26 +09:00
HudOverlay.cs	Fix using.	2017-03-11 14:28:06 +09:00
ModIcon.cs	Merge branch 'master' into modselect	2017-03-09 12:51:40 +09:00
Playfield.cs	Fix second mono regression.	2017-03-09 15:53:16 +09:00
StandardComboCounter.cs	Combo should not be longs.	2017-03-10 16:05:05 +09:00
StandardHealthDisplay.cs	More general refactorings.	2017-03-10 14:42:14 +09:00
StandardHudOverlay.cs	Re-add files.	2017-03-11 14:27:18 +09:00