Merge branch 'master' into profile

This commit is contained in:
Dean Herbert
2017-06-23 22:51:31 +09:00
committed by GitHub
13 changed files with 866 additions and 8 deletions

View File

@ -502,6 +502,9 @@
<Compile Include="Overlays\SearchableList\SlimEnumDropdown.cs" />
<Compile Include="Overlays\SearchableList\DisplayStyleControl.cs" />
<Compile Include="Graphics\UserInterface\BreadcrumbControl.cs" />
<Compile Include="Screens\Multiplayer\RoomInspector.cs" />
<Compile Include="Online\Multiplayer\GameType.cs" />
<Compile Include="Screens\Multiplayer\DrawableGameType.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\osu-framework\osu.Framework\osu.Framework.csproj">