Merge branch 'master' into modselect

This commit is contained in:
Huo Yaoyuan
2017-03-07 16:10:53 +08:00
212 changed files with 2573 additions and 740 deletions

View File

@ -60,7 +60,7 @@ namespace osu.Game.Overlays.Mods
}
private Color4 colour = Color4.White;
new public Color4 Colour
public new Color4 Colour
{
get
{