Merge remote-tracking branch 'upstream/master' into screen-title-class

This commit is contained in:
Dean Herbert
2019-03-29 14:01:08 +09:00
352 changed files with 2579 additions and 2602 deletions

View File

@ -80,7 +80,7 @@ namespace osu.Game.Screens.Multi
private void load(OsuColour colours)
{
Title = "multiplayer";
Icon = FontAwesome.fa_osu_multi;
Icon = OsuIcon.Multi;
AccentColour = colours.Yellow;
}
}