Merge branch 'master' into song-select

This commit is contained in:
Drew DeVault
2016-10-26 10:37:18 -04:00
16 changed files with 41 additions and 53 deletions

View File

@ -1,6 +1,7 @@
// Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
using osu.Framework;
using osu.Framework.GameModes.Testing;
using osu.Framework.Graphics.Cursor;
using osu.Game.Database;
@ -13,7 +14,7 @@ using osu.Game.GameModes.Play;
using SQLiteNetExtensions.Extensions;
using osu.Desktop.Platform;
namespace osu.Framework.VisualTests
namespace osu.Desktop.VisualTests
{
class VisualTestGame : OsuGameBase
{