diff options
| author | Techywarrior <techywarrior@gmail.com> | 2013-03-26 22:21:14 -0700 |
|---|---|---|
| committer | Techywarrior <techywarrior@gmail.com> | 2013-03-26 22:21:14 -0700 |
| commit | 12d5bdeaed5d7b73f6108d512c2cd0a85398ca74 (patch) | |
| tree | dd1b0a04f57bba462fa4dac841990d35091d57d3 | |
| parent | 7acd258a0f42c0c368fb816b08a881bdefc97360 (diff) | |
| parent | f9a1feecbf41a2568b1b3b6ae06b1c16671c0b1f (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
3 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 96db93a99..ba9812d33 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -200,7 +200,7 @@ </ProjectReference> </ItemGroup> <ItemGroup> - <EmbeddedResource Include="MediaInfo\ffmpeg20130310.zip" /> + <EmbeddedResource Include="MediaInfo\ffmpeg20130327.zip" /> <None Include="packages.config" /> </ItemGroup> <ItemGroup> diff --git a/MediaBrowser.Controller/MediaInfo/ffmpeg20130310.zip.REMOVED.git-id b/MediaBrowser.Controller/MediaInfo/ffmpeg20130310.zip.REMOVED.git-id deleted file mode 100644 index 59c2e4db3..000000000 --- a/MediaBrowser.Controller/MediaInfo/ffmpeg20130310.zip.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -8e635e6882f3482f3cabbfbf42b76e2c9d24678a
\ No newline at end of file diff --git a/MediaBrowser.Controller/MediaInfo/ffmpeg20130327.zip.REMOVED.git-id b/MediaBrowser.Controller/MediaInfo/ffmpeg20130327.zip.REMOVED.git-id new file mode 100644 index 000000000..7eeaacc0a --- /dev/null +++ b/MediaBrowser.Controller/MediaInfo/ffmpeg20130327.zip.REMOVED.git-id @@ -0,0 +1 @@ +5e4750e9819a6763ee6a30a36b675ffa846a710b
\ No newline at end of file |