Merge remote-tracking branch 'upstream/master' into beatmap_framework

This commit is contained in:
Dean Herbert
2016-09-30 00:13:08 +09:00
15 changed files with 93 additions and 26 deletions

View File

@ -84,6 +84,7 @@
<Compile Include="Graphics\Containers\OsuComponent.cs" />
<Compile Include="Graphics\Containers\OsuGameMode.cs" />
<Compile Include="Graphics\Containers\OsuLargeComponent.cs" />
<Compile Include="Graphics\Cursor\OsuCursorContainer.cs" />
<Compile Include="Graphics\Processing\RatioAdjust.cs" />
<Compile Include="Graphics\TextAwesome.cs" />
<Compile Include="Graphics\UserInterface\KeyCounter.cs" />