smoogipoo 6437fdd9db Merge remote-tracking branch 'origin/master' into mania-mask-container ... # Conflicts: # osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs		2018-07-17 16:46:48 +09:00
..
Layers/Selection/Overlays	Remove now unnecessary mask layer	2018-07-17 16:01:14 +09:00
ManiaEditPlayfield.cs	Merge remote-tracking branch 'origin/master' into mania-mask-container	2018-07-17 16:46:48 +09:00
ManiaEditRulesetContainer.cs	Merge remote-tracking branch 'origin/master' into mania-mask-container	2018-07-17 16:46:48 +09:00
ManiaEditStage.cs	Merge remote-tracking branch 'origin/master' into mania-mask-container	2018-07-17 16:46:48 +09:00
ManiaHitObjectComposer.cs	Remove more unused stuff	2018-07-17 16:01:47 +09:00