Merge branch 'master' into beatmap-options

This commit is contained in:
Seth
2017-03-03 00:52:45 -04:00
committed by GitHub
18 changed files with 78 additions and 62 deletions

View File

@ -2,8 +2,8 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Logging;
using osu.Game.Overlays.Pause;
using osu.Framework.Screens.Testing;
using osu.Game.Screens.Play;
namespace osu.Desktop.VisualTests.Tests
{