Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.1, 1.1.1, and 1.1.2

Merge with stable

Changeset 9e606e156439…

Parents 1330adfc9e8c…

Parents a93d34e9231b…

by Adrian Buehlmann

Changes to one file · Browse files at 9e606e156439 Showing diff from parent 1330adfc9e8c a93d34e9231b Diff from another changeset...

Change 1 of 5 Show Entire File contrib/​wix/​tortoisehg.wxs Stacked
 
15
16
17
 
 
18
19
20
 
126
127
128
129
 
130
131
132
 
135
136
137
138
 
139
140
141
 
231
232
233
234
 
235
236
237
 
273
274
275
276
 
277
278
279
 
15
16
17
18
19
20
21
22
 
128
129
130
 
131
132
133
134
 
137
138
139
 
140
141
142
143
 
233
234
235
 
236
237
238
239
 
275
276
277
 
278
279
280
281
@@ -15,6 +15,8 @@
  <?define IsX64 = no ?>   <?endif?>   + <?define ProgramRegKey = Software\TortoiseHg ?> +   <?define TOverlaysVersion = 1.0.15.18898 ?>   <?define TOverlaysSrcDir = ..\contrib\TortoiseOverlays ?>   <?define TOverlaysSrcFilenameX86 = TortoiseOverlays-$(var.TOverlaysVersion)-win32.msm ?> @@ -126,7 +128,7 @@
  </File>   <RegistryValue   Name='TortoiseHgRpcServer' - Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Run' + Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Run'   Type='string' Value='[INSTALLDIR]thgtaskbar.exe'   />   </Component> @@ -135,7 +137,7 @@
  Source='win32\ThgShellx86.dll'   />   <RegistryValue - Root='HKMU' Key='Software\TortoiseHg' + Root='HKLM' Key='$(var.ProgramRegKey)'   Type='string' Value='[INSTALLDIR]'   />   <RegistryValue @@ -231,7 +233,7 @@
  <Component Id="ProgramMenuDir" Guid="D5A63320-1238-489B-B68B-CF053E9577CA">   <RemoveFolder Id='ProgramMenuDir' On='uninstall' />   <RegistryValue - Root='HKCU' Key='Software\TortoiseHg' + Root='HKCU' Key='$(var.ProgramRegKey)'   Type='string' Value='[INSTALLDIR]' KeyPath='yes'   />   <Shortcut Id='UrlShortcut' Directory='ProgramMenuDir' Name='TortoiseHg Web Site' @@ -273,7 +275,7 @@
  Source='win32\ThgShellx64.dll'   />   <RegistryValue - Root='HKMU' Key='Software\TortoiseHg' + Root='HKLM' Key='$(var.ProgramRegKey)'   Type='string' Value='[INSTALLDIR]'   />   <RegistryValue