Merge branch 'master' into general-fixes

This commit is contained in:
Dean Herbert
2017-04-18 16:19:52 +09:00
committed by GitHub
244 changed files with 1387 additions and 913 deletions

View File

@ -129,7 +129,7 @@ namespace osu.Game.Overlays.Toolbar
}
}
public void SetGameMode(RulesetInfo ruleset) => modeSelector.SetGameMode(ruleset);
public void SetRuleset(RulesetInfo ruleset) => modeSelector.SetRuleset(ruleset);
protected override void PopIn()
{