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 'refs/remotes/upstream/master' into beatmap_framework

Browse Source 
# Conflicts:
#	osu.Game/GameModes/Menu/ButtonSystem.cs
#	osu.Game/OsuGame.cs
This commit is contained in:
Dean Herbert
2016-09-25 13:40:06 +09:00
parent 33e46facec 8a168f2d29
commit 58ed5c00e4
15 changed files with 439 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/osu.Game.csproj
View File

@ -97,6 +97,7 @@
<Compile Include="Online\Chat\Channel.cs" />
<Compile Include="Online\Chat\Message.cs" />
<Compile Include="OsuGame.cs" />
<Compile Include="OsuGameBase.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Users\User.cs" />
</ItemGroup>