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

This commit is contained in:
EVAST9919
2017-05-19 19:49:48 +03:00
7 changed files with 276 additions and 53 deletions

View File

@ -16,7 +16,7 @@ namespace osu.Desktop.VisualTests.Tests
base.Reset();
Add(new BackButton());
Add(new SkipButton());
Add(new SkipButton(Clock.CurrentTime + 5000));
}
}
}