Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Alex Amadori
2017-02-18 15:18:26 +01:00
65 changed files with 407 additions and 235 deletions

View File

@ -4,7 +4,7 @@
using System;
using System.Collections.Generic;
using osu.Desktop.VisualTests.Platform;
using osu.Framework.GameModes.Testing;
using osu.Framework.Screens.Testing;
using osu.Game.Database;
using osu.Game.Modes;
using osu.Game.Screens.Select;