Merge branch 'refs/heads/master' into beatmap_framework

# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
This commit is contained in:
Dean Herbert
2016-09-28 16:09:26 +09:00
8 changed files with 340 additions and 2 deletions

View File

@ -86,6 +86,10 @@
<Compile Include="Graphics\Containers\OsuLargeComponent.cs" />
<Compile Include="Graphics\Processing\RatioAdjust.cs" />
<Compile Include="Graphics\TextAwesome.cs" />
<Compile Include="Graphics\UserInterface\KeyCounter.cs" />
<Compile Include="Graphics\UserInterface\KeyCounterKeyboard.cs" />
<Compile Include="Graphics\UserInterface\KeyCounterCollection.cs" />
<Compile Include="Graphics\UserInterface\KeyCounterMouse.cs" />
<Compile Include="Online\API\APIAccess.cs" />
<Compile Include="Online\API\APIRequest.cs" />
<Compile Include="Online\API\OAuth.cs" />