You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Patrick Barron 9fa4fff15d Merge branch 'master' into event-rewrite-1 ... # Conflicts: # Emby.Dlna/Emby.Dlna.csproj # Emby.Dlna/Eventing/DlnaEventManager.cs # Emby.Dlna/Service/BaseService.cs # Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs # MediaBrowser.Controller/Subtitles/SubtitleDownloadEventArgs.cs		4 years ago
..
Device.cs	…
DeviceInfo.cs	…
MediaChangedEventArgs.cs	…
PlayToController.cs	Merge branch 'master' into event-rewrite-1	4 years ago
PlayToManager.cs	Merge branch 'master' into event-rewrite-1	4 years ago
PlaybackProgressEventArgs.cs	…
PlaybackStartEventArgs.cs	…
PlaybackStoppedEventArgs.cs	…
PlaylistItem.cs	…
PlaylistItemFactory.cs	…
SsdpHttpClient.cs	…
TransportCommands.cs	…
TransportState.cs	…
UpnpContainer.cs	…
uBaseObject.cs	…
uPnpNamespaces.cs	…