Merge branch 'master' into counters-a

This commit is contained in:
Adonais Romero González
2016-10-13 22:57:24 -05:00
20 changed files with 593 additions and 543 deletions

View File

@ -164,6 +164,7 @@
<Compile Include="OsuGameBase.cs" />
<Compile Include="Overlays\ChatConsole.cs" />
<Compile Include="Overlays\Options.cs" />
<Compile Include="Overlays\Overlay.cs" />
<Compile Include="Overlays\Toolbar.cs" />
<Compile Include="Overlays\ToolbarButton.cs" />
<Compile Include="Overlays\ToolbarModeButton.cs" />