1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 20:07:24 +08:00
osu-lazer/osu.Game.Modes.Taiko/Objects/Drawable
smoogipooo 3cecffbc48 Merge branch 'taiko_note_circle' into taiko_drawable_drawing
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-24 15:17:17 +09:00
..
Pieces Fix post-merge errors. 2017-03-24 15:14:49 +09:00
DrawableTaikoHitObject.cs Fix post-merge errors. 2017-03-24 15:14:49 +09:00