Merge branch 'master' into general-fixes

This commit is contained in:
Dean Herbert
2017-04-18 16:19:52 +09:00
committed by GitHub
244 changed files with 1387 additions and 913 deletions

View File

@ -18,9 +18,9 @@ using osu.Game.Beatmaps.Drawables;
using osu.Game.Database;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Modes;
using osu.Game.Modes.Objects;
using osu.Game.Modes.Objects.Types;
using osu.Game.Rulesets;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Types;
namespace osu.Game.Screens.Select
{