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
..
OsuHitRenderer.cs	Merge remote-tracking branch 'upstream/master' into general-fixes	2017-03-14 16:15:26 +09:00
OsuPlayfield.cs	Move InputManager to a higher and more implicit level.	2017-03-07 19:30:48 +09:00