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

Merge remote-tracking branch 'upstream/master' into tournament-tools

Browse Source
This commit is contained in:
Dean Herbert
2018-11-22 10:25:30 +09:00
parent 8fab241ce3 65f4a01081
commit f91d2e2e07
494 changed files with 1010 additions and 911 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
View File

@ -13,9 +13,9 @@ using osu.Game.Graphics.UserInterface;
using osu.Game.Tournament.Components;
using osu.Game.Tournament.Screens.Ladder.Components;
using osu.Game.Tournament.Screens.Showcase;
using OpenTK;
using OpenTK.Graphics;
using OpenTK.Input;
using osuTK;
using osuTK.Graphics;
using osuTK.Input;
namespace osu.Game.Tournament.Screens.Gameplay.Components
{

2
osu.Game.Tournament/Screens/Gameplay/Components/MatchScoreDisplay.cs
View File

@ -10,7 +10,7 @@ using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics.UserInterface;
using osu.Game.Tournament.IPC;
using osu.Game.Tournament.Screens.Ladder.Components;
using OpenTK.Graphics;
using osuTK.Graphics;
namespace osu.Game.Tournament.Screens.Gameplay.Components
{