smoogipoo 577ff4cc7f Merge remote-tracking branch 'origin/master' into mania-mask-container ... # Conflicts: # osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs # osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs # osu.Game.Rulesets.Mania/UI/ManiaStage.cs		2018-07-17 13:13:57 +09:00
..
Layers	Update visual style to match new notes	2018-06-07 19:19:32 +09:00
ManiaEditPlayfield.cs	Merge remote-tracking branch 'origin/master' into mania-mask-container	2018-07-17 13:13:57 +09:00
ManiaEditRulesetContainer.cs	Merge remote-tracking branch 'origin/master' into mania-mask-container	2018-07-17 13:13:57 +09:00
ManiaEditStage.cs	Merge remote-tracking branch 'origin/master' into mania-mask-container	2018-07-17 13:13:57 +09:00
ManiaHitObjectComposer.cs	Merge remote-tracking branch 'origin/master' into mania-mask-container	2018-07-17 13:13:57 +09:00