jellyfin/Emby.Server.Implementations
Erwin de Haan 49b61f238e Merge branch 'dev' into reformat
# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
#	Emby.Server.Implementations/LiveTv/LiveTvManager.cs
#	Emby.Server.Implementations/Security/MBLicenseFile.cs
#	Emby.Server.Implementations/Security/PluginSecurityManager.cs
#	Emby.Server.Implementations/Security/RegRecord.cs
#	MediaBrowser.Api/PluginService.cs
#	MediaBrowser.Api/System/SystemService.cs
#	MediaBrowser.Common/Security/IRequiresRegistration.cs
#	MediaBrowser.Common/Security/ISecurityManager.cs
#	MediaBrowser.Common/Security/PaymentRequiredException.cs
#	MediaBrowser.Model/Entities/MBRegistrationRecord.cs
#	MediaBrowser.Model/Entities/PluginSecurityInfo.cs
#	deployment/win-generic/build-jellyfin.ps1
2019-01-15 17:34:39 +01:00
..
Activity ReSharper conform to 'var' settings 2019-01-13 21:37:13 +01:00
AppBase ReSharper conform to 'var' settings 2019-01-13 21:37:13 +01:00
Archiving Find+Sed BOM removal *.cs: BDInfo-Emby.XmlTv 2019-01-13 20:54:44 +01:00
Branding Find+Sed BOM removal *.cs: BDInfo-Emby.XmlTv 2019-01-13 20:54:44 +01:00
Browser Find+Sed BOM removal *.cs: BDInfo-Emby.XmlTv 2019-01-13 20:54:44 +01:00
Channels ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Collections Find+Sed BOM removal *.cs: BDInfo-Emby.XmlTv 2019-01-13 20:54:44 +01:00
Configuration ReSharper conform to 'var' settings 2019-01-13 21:37:13 +01:00
Cryptography Find+Sed BOM removal *.cs: BDInfo-Emby.XmlTv 2019-01-13 20:54:44 +01:00
Data ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Devices ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Diagnostics Find+Sed BOM removal *.cs: BDInfo-Emby.XmlTv 2019-01-13 20:54:44 +01:00
Dto ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
EntryPoints ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
EnvironmentInfo Find+Sed BOM removal *.cs: BDInfo-Emby.XmlTv 2019-01-13 20:54:44 +01:00
FFMpeg Find+Sed BOM removal *.cs: BDInfo-Emby.XmlTv 2019-01-13 20:54:44 +01:00
HttpClientManager ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
HttpServer Merge branch 'dev' into reformat 2019-01-15 17:34:39 +01:00
Images Find+Sed BOM removal *.cs: BDInfo-Emby.XmlTv 2019-01-13 20:54:44 +01:00
IO Merge branch 'dev' into reformat 2019-01-13 21:59:37 +01:00
Library ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
LiveTv Merge branch 'dev' into reformat 2019-01-15 17:34:39 +01:00
Localization ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
MediaEncoder Visual Studio Reformat: Emby.Server.Implementations Part Liv-P 2019-01-13 20:22:00 +01:00
Net ReSharper conform to 'var' settings 2019-01-13 21:37:13 +01:00
Networking ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Playlists ReSharper conform to 'var' settings 2019-01-13 21:37:13 +01:00
Properties Merge branch 'dev' into code-cleanup 2019-01-11 12:50:36 +01:00
Reflection Find+Sed BOM removal *.cs: BDInfo-Emby.XmlTv 2019-01-13 20:54:44 +01:00
ScheduledTasks ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Security Merge branch 'dev' into reformat 2019-01-15 17:34:39 +01:00
Serialization ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Services ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Session ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Sorting ReSharper conform to 'var' settings 2019-01-13 21:37:13 +01:00
TextEncoding ReSharper format: conform inline 'out' parameters. 2019-01-13 21:46:33 +01:00
Threading Find+Sed BOM removal *.cs: BDInfo-Emby.XmlTv 2019-01-13 20:54:44 +01:00
TV ReSharper conform to 'var' settings 2019-01-13 21:37:13 +01:00
Udp Visual Studio Reformat: Emby.Server.Implementations Part U-U & Root 2019-01-13 20:23:38 +01:00
Updates Merge branch 'dev' into reformat 2019-01-15 17:34:39 +01:00
UserViews Find+Sed BOM removal *.cs: BDInfo-Emby.XmlTv 2019-01-13 20:54:44 +01:00
Xml Find+Sed BOM removal *.cs: BDInfo-Emby.XmlTv 2019-01-13 20:54:44 +01:00
ApplicationHost.cs Merge branch 'dev' into reformat 2019-01-15 17:34:39 +01:00
Emby.Server.Implementations.csproj Find+Sed BOM removal *.xml,*.csproj,*,json,*.sln,*.txt 2019-01-13 21:10:15 +01:00
ResourceFileManager.cs Find+Sed BOM removal *.cs: BDInfo-Emby.XmlTv 2019-01-13 20:54:44 +01:00
ServerApplicationPaths.cs Find+Sed BOM removal *.cs: BDInfo-Emby.XmlTv 2019-01-13 20:54:44 +01:00
StartupOptions.cs Find+Sed BOM removal *.cs: BDInfo-Emby.XmlTv 2019-01-13 20:54:44 +01:00
SystemEvents.cs Find+Sed BOM removal *.cs: BDInfo-Emby.XmlTv 2019-01-13 20:54:44 +01:00