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		2013-11-01 11:59:42 -04:00
..
AudioHlsService.cs	replace file system calls with IFileSystem when needed	2013-10-31 10:03:23 -04:00
BaseHlsService.cs	replace file system calls with IFileSystem when needed	2013-10-31 10:03:23 -04:00
HlsSegmentResponseFilter.cs	support multiple remote control outputs	2013-09-24 15:54:42 -04:00
HlsSegmentService.cs	improve shortcut performance	2013-10-03 11:24:32 -04:00
VideoHlsService.cs	Merge branch 'master' of https://github.com/tikuf/MediaBrowser	2013-11-01 11:59:42 -04:00