Merge branch 'master' into fix-editor-skinning

This commit is contained in:
Dan Balasescu 2019-10-08 13:28:10 +09:00 committed by GitHub
commit 73e3dac64b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System.Linq;
using osuTK;
using osuTK.Graphics;
using osu.Framework.Allocation;
@ -105,6 +106,8 @@ namespace osu.Game.Screens.Edit.Components
TabContainer.Spacing = Vector2.Zero;
tempo_values.ForEach(AddItem);
Current.Value = tempo_values.Last();
}
public class PlaybackTabItem : TabItem<double>