1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-23 03:43:00 +08:00
osu-lazer/osu.Game.Modes.Taiko/Objects/Drawable
smoogipooo 33c160efeb Merge branch 'taiko_note_circle' into taiko_drawable_drawing
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-24 16:02:49 +09:00
..
Pieces Adjust comment. 2017-03-24 15:55:25 +09:00
DrawableTaikoHitObject.cs Fix something that was removed during merge conflicts. 2017-03-24 15:19:58 +09:00