smoogipooo b4ed8aeb98 Merge remote-tracking branch 'origin/master' into taiko_barlines
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
	osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
	osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-04-01 23:57:02 +09:00
..
2017-03-21 21:27:20 +09:00
2017-03-30 15:51:16 +09:00
2017-03-28 15:05:45 +09:00
2017-03-28 17:14:06 +09:00