mirror
/
Lidarr
mirror of https://github.com/lidarr/Lidarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into backbone

This commit is contained in:
Mark McDowall 2012-12-29 16:09:35 -08:00
parent f31b1368f9 c4282dc41f
commit 2a7f38f03d
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
NzbDrone.Web/NzbDrone.Web.csproj
View File

@ -320,14 +320,6 @@
<None Include="_bin_deployableAssemblies\x86\sqlceca40.dll" /> <None Include="_bin_deployableAssemblies\x86\sqlceca40.dll" />
<None Include="_bin_deployableAssemblies\x86\Microsoft.VC90.CRT\README_ENU.txt" /> <None Include="_bin_deployableAssemblies\x86\Microsoft.VC90.CRT\README_ENU.txt" />
<None Include="_bin_deployableAssemblies\x86\Microsoft.VC90.CRT\msvcr90.dll" /> <None Include="_bin_deployableAssemblies\x86\Microsoft.VC90.CRT\msvcr90.dll" />
<None Include="_bin_deployableAssemblies\amd64\sqlcese40.dll" />
<None Include="_bin_deployableAssemblies\amd64\sqlceqp40.dll" />
<None Include="_bin_deployableAssemblies\amd64\sqlceme40.dll" />
<None Include="_bin_deployableAssemblies\amd64\sqlceer40EN.dll" />
<None Include="_bin_deployableAssemblies\amd64\sqlcecompact40.dll" />
<None Include="_bin_deployableAssemblies\amd64\sqlceca40.dll" />
<None Include="_bin_deployableAssemblies\amd64\Microsoft.VC90.CRT\README_ENU.txt" />
<None Include="_bin_deployableAssemblies\amd64\Microsoft.VC90.CRT\msvcr90.dll" />
<None Include="_bin_deployableAssemblies\x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" /> <None Include="_bin_deployableAssemblies\x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -544,7 +536,6 @@
<Content Include="Views\System\Config.cshtml" /> <Content Include="Views\System\Config.cshtml" />
<Content Include="Views\Settings\_SettingsLayout.cshtml" /> <Content Include="Views\Settings\_SettingsLayout.cshtml" />
<Content Include="Views\Shared\FreeSpace.cshtml" /> <Content Include="Views\Shared\FreeSpace.cshtml" />
<None Include="_bin_deployableAssemblies\amd64\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="App_Data\" /> <Folder Include="App_Data\" />

2
service_stage.bat
View File

@ -26,6 +26,6 @@ cd ..
rd C:\inetpub\services_stage /S /Q rd C:\inetpub\services_stage /S /Q
xcopy _rawPackage_service\*.* C:\inetpub\services_stage /E /V /I /Y xcopy _rawPackage_service\*.* C:\inetpub\stage-services.nzbdrone.com /E /V /I /Y