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

fix merge conflict

Browse Source
This commit is contained in:
Luke Pulverenti 2015-12-19 10:54:44 -05:00
parent 6949e502dd
commit ca52e8c23b
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Server.Mono/MediaBrowser.MediaInfo.dll.config
View File

@ -1,4 +0,0 @@
<configuration>
<dllmap dll="MediaInfo" target="./MediaInfo/osx/libmediainfo.dylib" os="osx"/>
<dllmap dll="MediaInfo" target="libmediainfo.so" os="linux"/>
</configuration>

3
MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
View File

@ -160,9 +160,6 @@
<None Include="ImageMagickSharp.dll.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="MediaBrowser.MediaInfo.dll.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="packages.config" />
<None Include="System.Data.SQLite.dll.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

7
MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
View File

@ -177,13 +177,6 @@
<Link>x86\SQLite.Interop.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="..\ThirdParty\MediaInfo\windows\x64\MediaInfo.dll">
<Link>x64\MediaInfo.dll</Link>
</Content>
<Content Include="..\ThirdParty\MediaInfo\windows\x86\MediaInfo.dll">
<Link>x86\MediaInfo.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="x64\CORE_RL_bzlib_.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>

9
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -332,6 +332,15 @@
<Content Include="dashboard-ui\devices\android\android.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\themes\holiday\bg.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\themes\holiday\style.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\themes\holiday\theme.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\themes\halloween\bg.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>