Merge branch 'note-placement' into inter-column-movements

# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs
This commit is contained in:
smoogipoo
2018-11-26 11:47:22 +09:00
7 changed files with 49 additions and 36 deletions

View File

@ -2,7 +2,7 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Game.Rulesets.Mania.UI;
using OpenTK;
using osuTK;
namespace osu.Game.Rulesets.Mania.Edit
{