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
..
Beatmaps	Merge remote-tracking branch 'origin/master' into fix-slider-samples	2018-11-05 16:38:28 +09:00
Difficulty	…
Judgements	…
MathUtils	…
Mods	…
Objects	Merge remote-tracking branch 'origin/master' into fix-slider-samples	2018-11-05 16:38:28 +09:00
Properties	…
Replays	…
Resources/Testing/Beatmaps	…
Scoring	…
UI	Merge remote-tracking branch 'origin/master' into editor-mask-placement	2018-10-16 17:28:16 +09:00
CatchInputManager.cs	…
CatchRuleset.cs	…
osu.Game.Rulesets.Catch.csproj	…