Luke Pulverenti 1cdb420d2e Merge branch 'beta' into dev ...

Conflicts:
	MediaBrowser.Api/StartupWizardService.cs
	MediaBrowser.Model/Configuration/ServerConfiguration.cs
	MediaBrowser.Server.Implementations/Dto/DtoService.cs
	MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
	MediaBrowser.Server.Implementations/Library/LibraryManager.cs
	MediaBrowser.Server.Implementations/Localization/Core/ca.json
	MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
	MediaBrowser.Server.Implementations/packages.config
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-selector/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/iron-selector/bower.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/html/ca.json
	MediaBrowser.WebDashboard/dashboard-ui/strings/javascript/ca.json
	SharedVersion.cs

2016-02-01 22:21:58 -05:00

..

ChannelConfigurations.cs

fixes #859 - Support adaptive bitrate streaming

2014-06-30 13:40:46 -04:00

ChannelDynamicMediaSourceProvider.cs

update stream generation

2015-03-29 00:56:39 -04:00

ChannelImageProvider.cs

live tv fix

2015-03-31 14:50:08 -04:00

ChannelManager.cs

Merge branch 'beta' into dev

2016-02-01 22:21:58 -05:00

ChannelPostScanTask.cs

encode with qsv

2015-11-06 10:02:22 -05:00

RefreshChannelsScheduledTask.cs

keep channels db clean

2015-08-22 13:50:37 -04:00