Merge branch 'master' into replay

# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
This commit is contained in:
Dean Herbert
2017-03-05 17:45:03 +09:00
96 changed files with 217 additions and 265 deletions

View File

@ -9,7 +9,6 @@ using System.Collections.Concurrent;
using osu.Framework.Input;
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Overlays.Mods;
namespace osu.Game.Modes
{