Merge master with conflicts resolved

This commit is contained in:
Andrei Zavatski
2020-01-26 16:35:07 +03:00
20 changed files with 160 additions and 136 deletions

View File

@ -9,7 +9,6 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API.Requests.Responses;
@ -26,7 +25,6 @@ namespace osu.Game.Overlays.Changelog
private const string listing_string = "listing";
public ChangelogHeader()
: base(OverlayColourScheme.Purple)
{
TabControl.AddItem(listing_string);
TabControl.Current.ValueChanged += e =>