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

@ -177,7 +177,7 @@ namespace osu.Game.Screens.Select
}
},
}
}).Preload(game, delegate (Drawable d)
}).LoadAsync(game, delegate (Drawable d)
{
FadeIn(250);