lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
Techywarrior 2013-03-26 22:21:14 -07:00
commit 12d5bdeaed
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Controller/MediaBrowser.Controller.csproj
View File

@ -200,7 +200,7 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="MediaInfo\ffmpeg20130310.zip" /> <EmbeddedResource Include="MediaInfo\ffmpeg20130327.zip" />
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

1
MediaBrowser.Controller/MediaInfo/ffmpeg20130310.zip.REMOVED.git-id
View File

@ -1 +0,0 @@
8e635e6882f3482f3cabbfbf42b76e2c9d24678a

1
MediaBrowser.Controller/MediaInfo/ffmpeg20130327.zip.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
5e4750e9819a6763ee6a30a36b675ffa846a710b