smoogipoo a4caaf56ef Merge remote-tracking branch 'origin/master' into fix-slider-samples ... # Conflicts: # osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs # osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs		2018-11-05 16:38:28 +09:00
..
Catch	Merge remote-tracking branch 'origin/master' into fix-slider-samples	2018-11-05 16:38:28 +09:00
Mania	Merge remote-tracking branch 'origin/master' into fix-slider-samples	2018-11-05 16:38:28 +09:00
Osu	Merge remote-tracking branch 'origin/master' into fix-slider-samples	2018-11-05 16:38:28 +09:00
Taiko	Merge remote-tracking branch 'origin/master' into fix-slider-samples	2018-11-05 16:38:28 +09:00
ConvertHitObjectParser.cs	Merge remote-tracking branch 'origin/master' into fix-slider-samples	2018-11-05 16:38:28 +09:00
ConvertHitObjectType.cs	Add combo offset to ConvertHitObjectParser	2018-08-15 10:49:45 +09:00
ConvertSlider.cs	Merge remote-tracking branch 'origin/master' into fix-slider-samples	2018-11-05 16:38:28 +09:00