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
..
Legacy	Merge remote-tracking branch 'origin/master' into fix-slider-samples	2018-11-05 16:38:28 +09:00
Pattern.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
PatternGenerator.cs	Aggressively check for valid columns before iterating endlessly	2018-08-24 23:57:44 +09:00