merge commit

This commit is contained in:
robvde 2012-09-10 21:27:46 +04:00
commit 6473026800

View file

@ -10,7 +10,6 @@
<RootFolder>..</RootFolder> <RootFolder>..</RootFolder>
<TrunkFolder>$(RootFolder)\WebsitePanel</TrunkFolder> <TrunkFolder>$(RootFolder)\WebsitePanel</TrunkFolder>
<SetupTrunkFolder>$(RootFolder)\WebsitePanel.Installer</SetupTrunkFolder> <SetupTrunkFolder>$(RootFolder)\WebsitePanel.Installer</SetupTrunkFolder>
<SetupBuildFolder>$(SetupTrunkFolder)\Build\$(BuildConfiguration)</SetupBuildFolder> <SetupBuildFolder>$(SetupTrunkFolder)\Build\$(BuildConfiguration)</SetupBuildFolder>