1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-24 04:38:44 +08:00

Merged branch master into round_masking

This commit is contained in:
Dean Herbert 2016-10-17 12:08:31 +09:00
commit bfbc26738c

@ -62,9 +62,9 @@ namespace osu.Game.Overlays
new ToolbarButton new ToolbarButton
{ {
Icon = FontAwesome.gear, Icon = FontAwesome.gear,
Action = OnSettings,
TooltipMain = "Settings", TooltipMain = "Settings",
TooltipSub = "Change your settings", TooltipSub = "Change your settings",
Action = OnSettings
}, },
new ToolbarButton new ToolbarButton
{ {