Merge branch 'master' into counters-a

This commit is contained in:
Adonais Romero González
2016-10-15 13:45:55 -05:00
19 changed files with 210 additions and 89 deletions

View File

@ -180,6 +180,7 @@
<Compile Include="Beatmaps\IO\OszArchiveReader.cs" />
<Compile Include="Beatmaps\BaseDifficulty.cs" />
<Compile Include="Beatmaps\Events\EventType.cs" />
<Compile Include="VolumeMeter.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(SolutionDir)\osu-framework\osu.Framework\osu.Framework.csproj">