Merge branch 'master' into fix-push-disabled-crash

This commit is contained in:
Dean Herbert
2017-12-30 18:48:03 +09:00
36 changed files with 404 additions and 166 deletions

View File

@ -14,7 +14,7 @@ namespace osu.Game.Screens.Select
HeaderText = @"You have no beatmaps!";
BodyText = "An existing copy of osu! was found, though.\nWould you like to import your beatmaps?";
Icon = FontAwesome.fa_trash_o;
Icon = FontAwesome.fa_plane;
Buttons = new PopupDialogButton[]
{