2 Commits

Author SHA1 Message Date
Thomas Müller
e2f279bda4 Merge branch 'master' of github.com:ppy/osu into fix-multi-segment-sliders
# Conflicts:
#	osu.Game.Mode.Osu/Objects/Slider.cs
2016-11-29 22:28:48 +01:00
Dean Herbert
a0503bd13f Tidy up Slider class. 2016-11-29 21:29:53 +09:00