Merge branch 'master' into musiccontroller-canbeatmapchange

This commit is contained in:
Marco Stephan
2017-06-21 12:23:38 +02:00
committed by GitHub
119 changed files with 135 additions and 100 deletions

View File

@ -23,6 +23,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Overlays.Music;
using osu.Game.Graphics.UserInterface;
using osu.Framework.Graphics.Shapes;
namespace osu.Game.Overlays
{