Merge branch 'master' into ColdVolcano/beat-syncing

This commit is contained in:
Dean Herbert
2017-05-23 10:51:47 +09:00
committed by GitHub
20 changed files with 823 additions and 156 deletions

View File

@ -81,6 +81,7 @@
<Compile Include="Overlays\Music\PlaylistItem.cs" />
<Compile Include="Overlays\Music\PlaylistList.cs" />
<Compile Include="Overlays\OnScreenDisplay.cs" />
<Compile Include="Graphics\Containers\SectionsContainer.cs" />
<Compile Include="Overlays\Settings\SettingsHeader.cs" />
<Compile Include="Overlays\Settings\Sections\Audio\MainMenuSettings.cs" />
<Compile Include="Overlays\Toolbar\ToolbarChatButton.cs" />