List:Commits« Previous MessageNext Message »
From:Reggie Burnett Date:March 22 2011 7:07pm
Subject:bzr commit into connector-net-6.1 branch (reggie.burnett:877)
View as plain text  
#At file:///C:/Users/Reggie/work/connector-net/6.1/ based on revid:reggie.burnett@stripped

  877 Reggie Burnett	2011-03-22 [merge]
      merged

    modified:
      Installer/Installer.wixproj
=== modified file 'Installer/Installer.wixproj'
=== modified file 'Installer/Installer.wixproj'
--- a/Installer/Installer.wixproj	2010-08-26 19:00:05 +0000
+++ b/Installer/Installer.wixproj	2011-03-22 19:07:05 +0000
@@ -145,7 +145,7 @@
     <Content Include="VS2008_Data.wxi" />
     <Content Include="VS2008_Registry.wxi" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets" />
   <PropertyGroup>
     <BuildDependsOn>RetrieveIdentities;$(BuildDependsOn)</BuildDependsOn>
   </PropertyGroup>

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).
Thread
bzr commit into connector-net-6.1 branch (reggie.burnett:877) Reggie Burnett22 Mar