Mercurial > hg-stable

changeset 12790:6c619c2e8778

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wix: add new merge-tools.txt help text
author Steve Borho <steve@borho.org>
date Wed, 20 Oct 2010 16:27:24 -0500
parents 24999db620cd
children 2c177bda512d
files contrib/wix/guids.wxi contrib/wix/help.wxs
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/wix/guids.wxi	Wed Oct 20 15:36:42 2010 -0500
+++ b/contrib/wix/guids.wxi	Wed Oct 20 16:27:24 2010 -0500
@@ -15,7 +15,7 @@
   <?define doc.style.css = {172F8262-98E0-4711-BD39-4DAE0D77EF05} ?>
 
   <!-- help.wxs -->
-  <?define helpFolder.guid = {9B541469-9C9E-4F25-B88B-048487AA582D} ?>
+  <?define helpFolder.guid = {870F98CE-5BC1-4396-9228-CEB234DFEC97} ?>
   
   <!-- i18n.wxs -->
   <?define i18nFolder.guid = {EADFA693-A0B5-4f31-87C9-3997CFAC1B42} ?>
--- a/contrib/wix/help.wxs	Wed Oct 20 15:36:42 2010 -0500
+++ b/contrib/wix/help.wxs	Wed Oct 20 16:27:24 2010 -0500
@@ -14,6 +14,7 @@
           <File Name="extensions.txt" />
           <File Name="glossary.txt" />
           <File Name="hgweb.txt" />
+          <File Name="merge-tools.txt" />
           <File Name="multirevs.txt" />
           <File Name="patterns.txt" />
           <File Name="revisions.txt" />