Merge branch 'master' into beatmap_parsing

This commit is contained in:
Dean Herbert
2017-03-14 17:50:00 +09:00
committed by GitHub
9 changed files with 106 additions and 53 deletions

View File

@ -181,6 +181,7 @@
<Compile Include="Screens\Multiplayer\Match.cs" />
<Compile Include="Screens\Multiplayer\MatchCreate.cs" />
<Compile Include="Screens\Play\FailDialog.cs" />
<Compile Include="Screens\Play\KeyConversionInputManager.cs" />
<Compile Include="Screens\Play\PlayerInputManager.cs" />
<Compile Include="Screens\Play\PlayerLoader.cs" />
<Compile Include="Screens\Play\SkipButton.cs" />