1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 12:37:29 +08:00
osu-lazer/osu.Game.Modes.Taiko/Beatmaps
smoogipooo b54e8356f2 Merge remote-tracking branch 'origin/master' into taiko_replays
Conflicts:
	osu.Game.Modes.Taiko/Beatmaps/TaikoBeatmapConverter.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-29 10:56:24 +09:00
..
TaikoBeatmapConverter.cs Merge remote-tracking branch 'origin/master' into taiko_replays 2017-03-29 10:56:24 +09:00
TaikoBeatmapProcessor.cs Rename TaikoBaseHit -> TaikoHitObject. 2017-03-17 13:33:48 +09:00