sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into download-tracking-component

Browse Source 
# Conflicts:
#	osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs
This commit is contained in:
Dean Herbert
2019-01-31 18:45:09 +09:00
parent a208874e74 9b12803e96
commit 327a34f12a
1386 changed files with 5965 additions and 3454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs
View File

@ -1,5 +1,5 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
// 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 osu.Framework.Allocation;
using osu.Framework.Configuration;