Merge branch 'mania-beatmap-conversion' into mania-endtime-object-conversion

# Conflicts:
#	osu.Game.Rulesets.Mania/Beatmaps/LegacyBeatmapConverter.cs
This commit is contained in:
smoogipooo
2017-05-19 17:50:19 +09:00
18 changed files with 173 additions and 193 deletions

View File

@ -50,7 +50,6 @@
<Compile Include="Beatmaps\Patterns\Legacy\EndTimeObjectPatternGenerator.cs" />
<Compile Include="Beatmaps\Patterns\Legacy\PatternGenerator.cs" />
<Compile Include="Beatmaps\Patterns\PatternGenerator.cs" />
<Compile Include="Beatmaps\LegacyBeatmapConverter.cs" />
<Compile Include="Beatmaps\Patterns\Legacy\PatternType.cs" />
<Compile Include="Beatmaps\ManiaBeatmapConverter.cs" />
<Compile Include="Beatmaps\Patterns\Pattern.cs" />