Merge branch 'master' of git://github.com/ppy/osu into details

This commit is contained in:
Jorolf
2017-03-29 15:47:00 +02:00
116 changed files with 672 additions and 476 deletions

View File

@ -249,7 +249,6 @@
<Compile Include="Online\Chat\Drawables\DrawableChannel.cs" />
<Compile Include="Online\Chat\Drawables\ChatLine.cs" />
<Compile Include="Online\Chat\Message.cs" />
<Compile Include="Online\User.cs" />
<Compile Include="OsuGame.cs" />
<Compile Include="OsuGameBase.cs" />
<Compile Include="Overlays\ChatOverlay.cs" />
@ -269,6 +268,7 @@
<Compile Include="Screens\Tournament\Teams\ITeamList.cs" />
<Compile Include="Screens\Tournament\ScrollingTeamContainer.cs" />
<Compile Include="Screens\Tournament\Teams\StorageBackedTeamList.cs" />
<Compile Include="Users\UpdateableAvatar.cs" />
<Compile Include="Users\User.cs" />
<Compile Include="Graphics\UserInterface\Volume\VolumeControl.cs" />
<Compile Include="Database\BeatmapDatabase.cs" />
@ -398,4 +398,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>