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

@ -6,7 +6,7 @@ using osu.Framework.Desktop;
using osu.Framework.Desktop.Platform;
using osu.Framework.Platform;
namespace osu.Framework.VisualTests
namespace osu.Desktop.VisualTests
{
public static class Program
{