Commit Graph

2 Commits

Author SHA1 Message Date
Dean Herbert abdfe42388 Merge branch 'refs/heads/master' into better-anchors
# Conflicts:
#	osu.Game.Mode.Osu/UI/OsuComboCounter.cs
#	osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs
2016-11-15 14:33:13 +09:00
Dean Herbert 6c7fab0e31 Fix some remaining naming discrepancies. 2016-11-14 19:20:21 +09:00