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.

Luke Pulverenti c543fdea3a Merge branch 'master' of https://github.com/tikuf/MediaBrowser ... Conflicts: MediaBrowser.Api/Playback/Hls/VideoHlsService.cs MediaBrowser.Api/Playback/Progressive/VideoService.cs		11 years ago
..
BdInfo	…
Configuration	…
Drawing	…
Dto	…
EntryPoints	…
HttpServer	…
IO	…
Library	…
LiveTv	…
Localization	…
MediaEncoder	Merge branch 'master' of https://github.com/tikuf/MediaBrowser	11 years ago
Persistence	…
Properties	…
Providers	…
ScheduledTasks	…
ServerManager	…
Session	…
Sorting	…
Udp	…
WebSocket	…
swagger-ui	…
MediaBrowser.Server.Implementations.csproj	…
ServerApplicationPaths.cs	…
packages.config	…