Merge branch 'master' into master

This commit is contained in:
Dean Herbert 2017-07-24 18:23:36 +09:00 committed by GitHub
commit 84f12c722f

View File

@ -18,10 +18,11 @@ using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Threading;
using osu.Framework.Configuration;
using osu.Game.Graphics.Containers;
namespace osu.Game.Screens.Select
{
internal class BeatmapCarousel : ScrollContainer
internal class BeatmapCarousel : OsuScrollContainer
{
public BeatmapInfo SelectedBeatmap => selectedPanel?.Beatmap;