Merge branch 'master'

This commit is contained in:
Huo Yaoyuan
2016-11-03 20:34:58 +08:00
61 changed files with 340 additions and 197 deletions

View File

@ -34,7 +34,7 @@ namespace osu.Desktop.VisualTests.Tests
private ChannelDisplay channelDisplay;
public override void Load(BaseGame game)
protected override void Load(BaseGame game)
{
base.Load(game);

View File

@ -19,7 +19,7 @@ namespace osu.Desktop.VisualTests.Tests
protected override IFrameBasedClock Clock => ourClock;
public override void Load(BaseGame game)
protected override void Load(BaseGame game)
{
base.Load(game);

View File

@ -24,7 +24,7 @@ namespace osu.Desktop.Tests
protected MusicController mc;
public override void Load(BaseGame game)
protected override void Load(BaseGame game)
{
base.Load(game);
ourClock = new FramedClock();