smoogipoo 5862eb172a Merge remote-tracking branch 'origin/master' into fix-zero-length-sliders ... # Conflicts: # 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		2019-07-05 15:48:04 +09:30
..
ConvertHit.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
ConvertHitObjectParser.cs	Merge remote-tracking branch 'origin/master' into fix-zero-length-sliders	2019-07-05 15:48:04 +09:30
ConvertHold.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
ConvertSlider.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
ConvertSpinner.cs	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00