smoogipooo 3f7cd41490 Merge branch 'master' into taiko_bash_drawable ... Conflicts: osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj		2017-03-20 18:20:32 +09:00
..
Drawable	Fix post-merge errors.	2017-03-17 19:25:55 +09:00
Bash.cs	Invert getters and setters for EndTime / Duration.	2017-03-17 14:43:00 +09:00
TaikoHitObject.cs	Remove unnecessary using.	2017-03-19 11:52:16 +09:00