Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

stable wix: catch up with Mercurial b30c889584ef (fixes #844)

Changeset 49d1b27ed01a…

Parent 90e1cc693356…

by Steve Borho

Changes to 3 files · Browse files at 49d1b27ed01a Showing diff from parent 90e1cc693356 Diff from another changeset...

Change 1 of 1 Show Entire File win32/​wix/​guids.wxi Stacked
 
15
16
17
18
 
19
20
21
22
23
24
25
 
26
27
28
 
 
29
30
31
 
32
33
34
 
15
16
17
 
18
19
20
21
22
23
24
 
25
26
 
 
27
28
29
30
 
31
32
33
34
@@ -15,20 +15,20 @@
  <?define doc.style.css = {F42E2E5F-6329-4269-B6D8-805C6CFD8D5E} ?>     <!-- help.wxs --> - <?define helpFolder.guid = {4B71277D-72E9-48F2-8A06-C706E9C3B4C0} ?> + <?define helpFolder.guid = {0CD881E3-815A-4227-9F7C-B9D70C1191EF} ?>     <!-- i18n.wxs -->   <?define i18nFolder.guid = {5191051C-742F-470E-AD76-D83C2F1EDE4E} ?>     <!-- templates.wxs -->   <?define templates.root.guid = {6A82D0BF-6878-42F3-92FD-AB39F7A97EEF} ?> - <?define templates.atom.guid = {602F0A54-F5AF-4D22-A2FE-80A188531D02} ?> + <?define templates.atom.guid = {68D030FA-56A1-4CAF-ADBF-07362B1DDF15} ?>   <?define templates.coal.guid = {89768AB3-A942-470B-8C1C-9C026B80FF8E} ?> - <?define templates.gitweb.guid = {66F4305F-8AC6-4B55-AC24-30FFC3161EF0} ?> - <?define templates.monoblue.guid = {F1CC0065-B3D2-4D4C-BD7F-EFDBB4B47CBB} ?> + <?define templates.gitweb.guid = {516A9A5F-33DF-41EC-B64C-F910251549D7} ?> + <?define templates.monoblue.guid = {BF01AC59-C62C-4946-B820-E528748EB3B2} ?>   <?define templates.paper.guid = {31BF16C5-3525-47F7-9733-F67A3B02171B} ?>   <?define templates.raw.guid = {936139F7-9A73-4685-80D2-F17A2BC42EAD} ?> - <?define templates.rss.guid = {891DA56F-B02B-456F-8471-FE47024051E7} ?> + <?define templates.rss.guid = {948BDACE-4E70-459A-BDD2-89158FD53F1F} ?>   <?define templates.spartan.guid = {C49A4A44-53EB-4C37-AA0B-159070F46E84} ?>   <?define templates.static.guid = {B6C414E5-CD1E-4820-86E7-EEC2386426BE} ?>  
Change 1 of 1 Show Entire File win32/​wix/​help.wxs Stacked
 
13
14
15
 
16
 
17
18
19
 
13
14
15
16
17
18
19
20
21
@@ -13,7 +13,9 @@
  <File Name="diffs.txt" />   <File Name="environment.txt" />   <File Name="extensions.txt" /> + <File Name="filesets.txt" />   <File Name="glossary.txt" /> + <File Name="hgignore.txt" />   <File Name="hgweb.txt" />   <File Name="merge-tools.txt" />   <File Name="multirevs.txt" />
Change 1 of 4 Show Entire File win32/​wix/​templates.wxs Stacked
 
45
46
47
 
 
48
49
50
 
58
59
60
 
61
62
63
 
85
86
87
 
88
89
90
 
161
162
163
 
 
164
165
166
 
45
46
47
48
49
50
51
52
 
60
61
62
63
64
65
66
 
88
89
90
91
92
93
94
 
165
166
167
168
169
170
171
172
@@ -45,6 +45,8 @@
  <File Id="atom.map" Name="map" />   <File Id="atom.tagentry.tmpl" Name="tagentry.tmpl" />   <File Id="atom.tags.tmpl" Name="tags.tmpl" /> + <File Id="atom.bookmarks.tmpl" Name="bookmarks.tmpl" /> + <File Id="atom.bookmarkentry.tmpl" Name="bookmarkentry.tmpl" />   </Component>   </Directory>   @@ -58,6 +60,7 @@
  <Directory Id="templates.gitwebdir" Name="gitweb">   <Component Id="templates.gitweb" Guid="$(var.templates.gitweb.guid)" Win64='$(var.IsX64)'>   <File Id="gitweb.branches.tmpl" Name="branches.tmpl" KeyPath="yes" /> + <File Id="gitweb.bookmarks.tmpl" Name="bookmarks.tmpl" />   <File Id="gitweb.changelog.tmpl" Name="changelog.tmpl" />   <File Id="gitweb.changelogentry.tmpl" Name="changelogentry.tmpl" />   <File Id="gitweb.changeset.tmpl" Name="changeset.tmpl" /> @@ -85,6 +88,7 @@
  <Directory Id="templates.monobluedir" Name="monoblue">   <Component Id="templates.monoblue" Guid="$(var.templates.monoblue.guid)" Win64='$(var.IsX64)'>   <File Id="monoblue.branches.tmpl" Name="branches.tmpl" KeyPath="yes" /> + <File Id="monoblue.bookmarks.tmpl" Name="bookmarks.tmpl" />   <File Id="monoblue.changelog.tmpl" Name="changelog.tmpl" />   <File Id="monoblue.changelogentry.tmpl" Name="changelogentry.tmpl" />   <File Id="monoblue.changeset.tmpl" Name="changeset.tmpl" /> @@ -161,6 +165,8 @@
  <File Id="rss.map" Name="map" />   <File Id="rss.tagentry.tmpl" Name="tagentry.tmpl" />   <File Id="rss.tags.tmpl" Name="tags.tmpl" /> + <File Id="rss.bookmarks.tmpl" Name="bookmarks.tmpl" /> + <File Id="rss.bookmarkentry.tmpl" Name="bookmarkentry.tmpl" />   </Component>   </Directory>