# HG changeset patch
# User Steve Borho <steve@borho.org>
# Date 1290823683 21600
# Node ID 1b1cbc2463775570c0ae85b5bfa49aa0015ecca4
# Parent  cc40e4f49559d91198c08f6ad2e8983fb8db23e4# Parent  db1433e4bf5fb65bf874d476c7da8834f57602c2
Merge with stable

diff -r cc40e4f49559 -r 1b1cbc246377 contrib/wix/mercurial.wxs
--- 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>