Merge branch 'master' into better-transforms

This commit is contained in:
Thomas Müller 2017-07-22 10:50:58 +02:00 committed by GitHub
commit e36b65bfe0

View File

@ -78,7 +78,7 @@ namespace osu.Game.Overlays.Chat
Padding = new MarginPadding { Left = padding, Right = padding }; Padding = new MarginPadding { Left = padding, Right = padding };
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader(true)]
private void load(OsuColour colours, UserProfileOverlay profile) private void load(OsuColour colours, UserProfileOverlay profile)
{ {
customUsernameColour = colours.ChatBlue; customUsernameColour = colours.ChatBlue;