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/MediaBrowser.Server.Implementations.csproj | |
| 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/MediaBrowser.Server.Implementations.csproj')
| -rw-r--r-- | MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index ba79ff5d5..66ec69f08 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -256,7 +256,7 @@ <ItemGroup> <EmbeddedResource Include="MediaEncoder\fonts\ARIALUNI.TTF" /> <EmbeddedResource Include="MediaEncoder\fonts\fonts.conf" /> - <EmbeddedResource Include="MediaEncoder\ffmpeg20130408.zip" /> + <EmbeddedResource Include="MediaEncoder\ffmpeg20130412.zip" /> <None Include="packages.config" /> </ItemGroup> <ItemGroup /> |