diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2011-10-01 20:49:36 +0000 |
|---|---|---|
| committer | Lorry <lorry@roadtrain.codethink.co.uk> | 2012-09-27 13:27:51 +0000 |
| commit | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (patch) | |
| tree | 3c4a89176ea67fe4c7bf7b375488361a823c95fa /contrib/wix | |
| parent | 9039c805b0a7e36220101323f82735f08a104b37 (diff) | |
| download | mercurial-tarball-master.tar.gz | |
Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master
Diffstat (limited to 'contrib/wix')
| -rw-r--r-- | contrib/wix/COPYING.rtf | bin | 1686 -> 1755 bytes | |||
| -rw-r--r-- | contrib/wix/README.txt | 2 | ||||
| -rw-r--r-- | contrib/wix/guids.wxi | 6 | ||||
| -rw-r--r-- | contrib/wix/help.wxs | 1 | ||||
| -rw-r--r-- | contrib/wix/i18n.wxs | 2 | ||||
| -rw-r--r-- | contrib/wix/templates.wxs | 1 |
6 files changed, 5 insertions, 7 deletions
diff --git a/contrib/wix/COPYING.rtf b/contrib/wix/COPYING.rtf Binary files differindex 3174226..3418a97 100644 --- a/contrib/wix/COPYING.rtf +++ b/contrib/wix/COPYING.rtf diff --git a/contrib/wix/README.txt b/contrib/wix/README.txt index 8d9ec37..0e43807 100644 --- a/contrib/wix/README.txt +++ b/contrib/wix/README.txt @@ -7,7 +7,7 @@ are versioned within the Mercurial source tree because the WXS files must kept up to date with distribution changes within their branch. In other words, the default branch WXS files are expected to diverge from the stable branch WXS files. Storing them within the same repository is -the only sane way to keep the source tree and the installer in sync. +the only sane way to keep the the source tree and the installer in sync. The MSI installer builder uses only the mercurial.ini file from the contrib/win32 folder, the contents of which have been historically used diff --git a/contrib/wix/guids.wxi b/contrib/wix/guids.wxi index d4360a4..867ad27 100644 --- a/contrib/wix/guids.wxi +++ b/contrib/wix/guids.wxi @@ -18,13 +18,13 @@ <?define doc.style.css = {172F8262-98E0-4711-BD39-4DAE0D77EF05} ?> <!-- help.wxs --> - <?define helpFolder.guid = {9FA957DB-6DFE-44f2-AD03-293B2791CF17} ?> + <?define helpFolder.guid = {84025FAA-7EB7-4D79-A097-D2D18852D78E} ?> <!-- i18n.wxs --> - <?define i18nFolder.guid = {1BF8026D-CF7C-4174-AEE6-D6B7BF119248} ?> + <?define i18nFolder.guid = {EADFA693-A0B5-4f31-87C9-3997CFAC1B42} ?> <!-- templates.wxs --> - <?define templates.root.guid = {8DF97574-33E9-412F-8414-65B48BB18783} ?> + <?define templates.root.guid = {111509CB-4C96-4035-80BC-F66A99CD5ACB} ?> <?define templates.atom.guid = {AB5D2908-BC95-44BE-9D79-069EF43D93E2} ?> <?define templates.coal.guid = {B63CCAAB-4EAF-43b4-901E-4BD13F5B78FC} ?> <?define templates.gitweb.guid = {6A33D168-F84E-45AA-912C-23CAC2D66BCA} ?> diff --git a/contrib/wix/help.wxs b/contrib/wix/help.wxs index 601ecdc..7dc3dd4 100644 --- a/contrib/wix/help.wxs +++ b/contrib/wix/help.wxs @@ -20,7 +20,6 @@ <File Name="merge-tools.txt" /> <File Name="multirevs.txt" /> <File Name="patterns.txt" /> - <File Name="phases.txt" /> <File Name="revisions.txt" /> <File Name="revsets.txt" /> <File Name="subrepos.txt" /> diff --git a/contrib/wix/i18n.wxs b/contrib/wix/i18n.wxs index 4c97ca4..60090cd 100644 --- a/contrib/wix/i18n.wxs +++ b/contrib/wix/i18n.wxs @@ -5,7 +5,7 @@ <?include defines.wxi ?> <?define hg_po_langs = - da;de;el;fr;it;ja;pt_BR;ro;ru;sv;zh_CN;zh_TW + da;de;el;fr;it;ja;pt_BR;sv;zh_CN;zh_TW ?> <Fragment> diff --git a/contrib/wix/templates.wxs b/contrib/wix/templates.wxs index ac2eacc..6b832a5 100644 --- a/contrib/wix/templates.wxs +++ b/contrib/wix/templates.wxs @@ -31,7 +31,6 @@ <File Name="map-cmdline.changelog" KeyPath="yes" /> <File Name="map-cmdline.compact" /> <File Name="map-cmdline.default" /> - <File Name="map-cmdline.bisect" /> <File Name="map-cmdline.xml" /> <File Name="template-vars.txt" /> </Component> |