Merge branch 'master' into backbone

pull/6/head
Mark McDowall 12 years ago
commit 2a7f38f03d

@ -320,14 +320,6 @@
<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\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" />
</ItemGroup>
<ItemGroup>
@ -544,7 +536,6 @@
<Content Include="Views\System\Config.cshtml" />
<Content Include="Views\Settings\_SettingsLayout.cshtml" />
<Content Include="Views\Shared\FreeSpace.cshtml" />
<None Include="_bin_deployableAssemblies\amd64\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest" />
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />

@ -26,6 +26,6 @@ cd ..
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

Loading…
Cancel
Save