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
..
AudioOptions.cs	…
CodecProfile.cs	…
CodecType.cs	…
ConditionProcessor.cs	…
ContainerProfile.cs	…
ContentFeatureBuilder.cs	…
DeviceIdentification.cs	…
DeviceProfile.cs	…
DeviceProfileInfo.cs	…
DeviceProfileType.cs	…
DirectPlayProfile.cs	…
DlnaFlags.cs	…
DlnaMaps.cs	…
DlnaProfileType.cs	…
EncodingContext.cs	…
HeaderMatchType.cs	…
HttpHeaderInfo.cs	…
IDeviceDiscovery.cs	…
ITranscoderSupport.cs	…
MediaFormatProfile.cs	…
MediaFormatProfileResolver.cs	…
PlaybackErrorCode.cs	…
ProfileCondition.cs	…
ProfileConditionType.cs	…
ProfileConditionValue.cs	…
ResolutionConfiguration.cs	…
ResolutionNormalizer.cs	…
ResolutionOptions.cs	…
ResponseProfile.cs	…
SearchCriteria.cs	…
SearchType.cs	…
SortCriteria.cs	…
StreamBuilder.cs	…
StreamInfo.cs	…
SubtitleDeliveryMethod.cs	…
SubtitleProfile.cs	…
SubtitleStreamInfo.cs	…
TranscodeSeekInfo.cs	…
TranscodingProfile.cs	…
UpnpDeviceInfo.cs	…
VideoOptions.cs	…
XmlAttribute.cs	…