Merge remote-tracking branch 'refs/remotes/ppy/master' into editor-playback-speed

This commit is contained in:
EVAST9919
2017-11-21 12:39:14 +03:00
7 changed files with 46 additions and 7 deletions

View File

@ -301,6 +301,7 @@
<Compile Include="Screens\Edit\Components\BottomBarContainer.cs" />
<Compile Include="Screens\Edit\Components\PlaybackContainer.cs" />
<Compile Include="Screens\Edit\Components\TimeInfoContainer.cs" />
<Compile Include="Rulesets\Mods\IApplicableToScoreProcessor.cs" />
<Compile Include="Screens\Edit\Screens\Compose\Timeline\BeatmapWaveformGraph.cs" />
<Compile Include="Beatmaps\Drawables\DifficultyColouredContainer.cs" />
<Compile Include="Beatmaps\Drawables\DifficultyIcon.cs" />