Merge branch 'master' into fix-deletion-crash

This commit is contained in:
Dean Herbert
2018-11-26 14:20:02 +09:00
committed by GitHub
477 changed files with 1022 additions and 780 deletions

View File

@ -13,7 +13,7 @@ using osu.Framework.Timing;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Objects;
using osu.Game.Screens.Edit.Compose;
using OpenTK;
using osuTK;
namespace osu.Game.Rulesets.Edit
{

View File

@ -10,7 +10,7 @@ using osu.Framework.Input.Events;
using osu.Framework.Input.States;
using osu.Game.Graphics.UserInterface;
using osu.Game.Rulesets.Objects.Drawables;
using OpenTK;
using osuTK;
namespace osu.Game.Rulesets.Edit
{