diff options
| author | Eric Reed <ebr@mediabrowser3.com> | 2013-04-15 08:09:49 -0400 |
|---|---|---|
| committer | Eric Reed <ebr@mediabrowser3.com> | 2013-04-15 08:09:49 -0400 |
| commit | ae307f1c7d6e31d9813db3858dc912aff5b201d0 (patch) | |
| tree | fb70aaa859fb965fd8d03beb80aa6a6b6e256693 /MediaBrowser.Server.Implementations/MediaEncoder | |
| parent | 8e0722085d55b96ffc9aad330f63d1869835478c (diff) | |
| parent | a4cac9c95df1f169fd3457d25466f6896e12cd3f (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts:
MediaBrowser.Installer/MainWindow.xaml.cs
Diffstat (limited to 'MediaBrowser.Server.Implementations/MediaEncoder')
| -rw-r--r-- | MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130408.zip.REMOVED.git-id | 1 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130412.zip.REMOVED.git-id | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130408.zip.REMOVED.git-id b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130408.zip.REMOVED.git-id deleted file mode 100644 index c1a4c08b1..000000000 --- a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130408.zip.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -13efb0e506699c6d90c23a7600b3556d91dd31a1
\ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130412.zip.REMOVED.git-id b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130412.zip.REMOVED.git-id new file mode 100644 index 000000000..71f2b701c --- /dev/null +++ b/MediaBrowser.Server.Implementations/MediaEncoder/ffmpeg20130412.zip.REMOVED.git-id @@ -0,0 +1 @@ +1b75cc4abcfd185b6db07bbe433d010f947d50ae
\ No newline at end of file |