Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
authorSteve Borho <steve@borho.org>
Fri, 26 Nov 2010 20:08:03 -0600
changeset 13045 1b1cbc246377
parent 13043 cc40e4f49559 (current diff)
parent 13044 db1433e4bf5f (diff)
child 13046 7cc4263e07a9
Merge with stable
--- a/contrib/wix/mercurial.wxs	Fri Nov 26 18:04:10 2010 -0600
+++ b/contrib/wix/mercurial.wxs	Fri Nov 26 20:08:03 2010 -0600
@@ -33,11 +33,6 @@
            CompressionLevel='high' />
     <Property Id='DiskPrompt' Value="Mercurial $(var.Version) Installation [1]" />
 
-    <?if $(var.Platform) = "x86" ?>
-      <Condition Message = "This x86 installer may not be used on a x64 platform">
-          NOT VersionNT64
-      </Condition>
-    <?endif?>
     <Condition Message='Mercurial MSI installers require Windows XP or higher'>
         VersionNT >= 501
     </Condition>
Mercurial