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

Merge branch 'master' of https://github.com/ppy/osu into Private_Messages

Browse Source 
# Conflicts:
#	osu.Game/Overlays/Chat/ChatTabControl.cs
#	osu.Game/Overlays/ChatOverlay.cs
This commit is contained in:
miterosan
2018-07-23 15:45:54 +02:00
parent d03367ef9e 9dc55688d2
commit 9f43e0c900
251 changed files with 1959 additions and 1193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs
View File

@ -10,7 +10,7 @@ using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input;
using osu.Framework.Input.States;
using osu.Game.Graphics;
using osu.Game.Graphics.Backgrounds;
using osu.Game.Graphics.Sprites;