Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor

This commit is contained in:
EVAST9919
2017-05-03 08:26:54 +03:00
14 changed files with 85 additions and 51 deletions

View File

@ -326,6 +326,7 @@
<Compile Include="Screens\Tournament\Teams\ITeamList.cs" />
<Compile Include="Screens\Tournament\ScrollingTeamContainer.cs" />
<Compile Include="Screens\Tournament\Teams\StorageBackedTeamList.cs" />
<Compile Include="Screens\Tournament\Teams\DrawingsTeam.cs" />
<Compile Include="Users\UpdateableAvatar.cs" />
<Compile Include="Users\User.cs" />
<Compile Include="Graphics\UserInterface\Volume\VolumeControl.cs" />