smoogipoo 70f1d17b7e Merge remote-tracking branch 'origin/master' into editor-mask-placement ... # Conflicts: # osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs # osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs # osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs # osu.Game/Rulesets/UI/RulesetContainer.cs		2018-10-16 17:28:16 +09:00
..
Cursor	Adapt signature change of event handlers	2018-10-02 12:02:55 +09:00
OsuPlayfield.cs	Merge remote-tracking branch 'origin/master' into playfield-scaling-rework	2018-10-05 10:40:16 +09:00
OsuRulesetContainer.cs	Merge remote-tracking branch 'origin/master' into editor-mask-placement	2018-10-16 17:28:16 +09:00
OsuSettings.cs	Give ruleset settings a ruleset-specific config manager	2018-06-11 13:28:50 +09:00
PlayfieldAdjustmentContainer.cs	PlayfieldLayer -> PlayfieldAdjustmentContainer	2018-10-05 10:39:18 +09:00