Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options

This commit is contained in:
EVAST9919
2017-05-22 09:12:40 +03:00
36 changed files with 732 additions and 189 deletions

View File

@ -87,8 +87,5 @@ namespace osu.Game.Graphics
public readonly Color4 RedDarker = FromHex(@"870000");
public readonly Color4 ChatBlue = FromHex(@"17292e");
public readonly Color4 SpinnerBase = FromHex(@"002c3c");
public readonly Color4 SpinnerFill = FromHex(@"005b7c");
}
}