smoogipoo 29422345f7 Merge remote-tracking branch 'origin/master' into fix-mask-disposal ... # Conflicts: # osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs # osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/SliderCirclePiece.cs # osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs # osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderHead.cs # osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSliderTail.cs # osu.Game.Rulesets.Osu/Objects/Slider.cs		2018-11-14 14:03:25 +09:00
..
Blueprints	Merge remote-tracking branch 'origin/master' into fix-mask-disposal	2018-11-14 14:03:25 +09:00
HitCircleCompositionTool.cs	Adjust ruleset-specific namespaces	2018-11-07 16:10:21 +09:00
OsuEditRulesetContainer.cs	Reduce complexity of creating edit ruleset containers	2018-10-17 18:06:00 +09:00
OsuHitObjectComposer.cs	Adjust ruleset-specific namespaces	2018-11-07 16:10:21 +09:00
SliderCompositionTool.cs	Adjust ruleset-specific namespaces	2018-11-07 16:10:21 +09:00
SpinnerCompositionTool.cs	Adjust ruleset-specific namespaces	2018-11-07 16:10:21 +09:00