Merge remote-tracking branch 'upstream/master' into remove-usings

This commit is contained in:
Dean Herbert
2017-02-24 11:29:34 +09:00
25 changed files with 38 additions and 43 deletions

View File

@ -88,7 +88,7 @@ namespace osu.Game.Screens.Menu
[BackgroundDependencyLoader]
private void load(OsuGame game, OsuColour colours)
{
(intro = new Intro()).Preload(game);
(intro = new Intro()).LoadAsync(game);
iconColour = colours.Yellow;
}