Merge branch 'mania-selection-movement' into inter-column-movements

# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
#	osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
This commit is contained in:
smoogipoo
2018-11-26 11:45:48 +09:00
488 changed files with 1603 additions and 967 deletions

View File

@ -8,7 +8,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Primitives;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events;
using OpenTK.Graphics;
using osuTK.Graphics;
namespace osu.Game.Screens.Edit.Compose.Components
{