Merge remote-tracking branch 'upstream/master' into import-from-stable

This commit is contained in:
Dean Herbert
2017-07-31 17:31:10 +09:00
13 changed files with 73 additions and 50 deletions

View File

@ -251,7 +251,7 @@
<Compile Include="Configuration\OsuConfigManager.cs" />
<Compile Include="Overlays\Notifications\IHasCompletionTarget.cs" />
<Compile Include="Overlays\Notifications\Notification.cs" />
<Compile Include="Overlays\NotificationManager.cs" />
<Compile Include="Overlays\NotificationOverlay.cs" />
<Compile Include="Overlays\Notifications\NotificationSection.cs" />
<Compile Include="Overlays\Notifications\ProgressCompletionNotification.cs" />
<Compile Include="Overlays\Notifications\ProgressNotification.cs" />