Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor

# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
This commit is contained in:
Thomas Müller
2017-03-01 18:05:58 +01:00
54 changed files with 321 additions and 203 deletions

View File

@ -116,7 +116,7 @@ namespace osu.Game.Screens.Menu
}
[BackgroundDependencyLoader(true)]
private void load(AudioManager audio, OsuGame game = null)
private void load(OsuGame game = null)
{
toolbar = game?.Toolbar;
}