jellyfin-server/MediaBrowser.Api/Playback/Progressive
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
..
AudioService.cs replace file system calls with IFileSystem when needed 2013-10-31 10:03:23 -04:00
BaseProgressiveStreamingService.cs replace file system calls with IFileSystem when needed 2013-10-31 10:03:23 -04:00
ProgressiveStreamWriter.cs replace file system calls with IFileSystem when needed 2013-10-31 10:03:23 -04:00
VideoService.cs Merge branch 'master' of https://github.com/tikuf/MediaBrowser 2013-11-01 11:59:42 -04:00