smoogipooo cd435f7ec6 Merge remote-tracking branch 'origin/master' into timingchange-rework ... # Conflicts: # osu-framework # osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs		2017-06-09 03:37:55 +09:00
..
Column.cs	Merge remote-tracking branch 'origin/master' into timingchange-rework	2017-06-09 03:37:55 +09:00
ManiaHitRenderer.cs	Rewrite mania to use the new timing section stuff.	2017-06-09 02:43:48 +09:00
ManiaPlayfield.cs	Remove IHasTimeSpan, add rename to TimingSection.	2017-06-08 23:40:24 +09:00
SpecialColumnPosition.cs	ColumnStyle -> ColumnPosition.	2017-05-04 14:54:31 +09:00