Merge branch 'master' into leaderboards

This commit is contained in:
Dean Herbert
2017-03-22 08:24:49 +09:00
committed by GitHub
36 changed files with 173 additions and 68 deletions

View File

@ -161,7 +161,7 @@ namespace osu.Game.Screens.Tournament
Text = "Control Panel",
TextSize = 22f,
Font = "Exo2.0-Boldd"
Font = "Exo2.0-Bold"
},
new FillFlowContainer
{