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 583d476031f3…

Parents f82ea34b322b…

Parents 9c25484a5a67…

by Adrian Buehlmann

Changes to one file · Browse files at 583d476031f3 Showing diff from parent f82ea34b322b 9c25484a5a67 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​wix/​shell-register.wxi Stacked
 
81
82
83
84
 
85
86
87
88
 
89
90
91
92
 
 
93
94
95
96
 
97
98
99
100
101
102
 
103
104
105
106
 
107
108
109
110
 
111
112
113
114
 
115
116
117
118
 
119
120
121
 
81
82
83
 
84
85
86
87
 
88
89
90
 
 
91
92
93
94
95
 
96
97
98
99
100
101
 
102
103
104
105
 
106
107
108
109
 
110
111
112
113
 
114
115
116
117
 
118
119
120
121
@@ -81,41 +81,41 @@
    <!-- register overlay components with TortoiseOverlays -->   <RegistryValue - Root='HKMU' Key='Software\TortoiseOverlays\Normal' + Root='HKLM' Key='Software\TortoiseOverlays\Normal'   Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgNormal)'   />   <RegistryValue - Root='HKMU' Key='Software\TortoiseOverlays\Added' + Root='HKLM' Key='Software\TortoiseOverlays\Added'   Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgAdded)'   /> - <RegistryValue Root='HKMU' - Key='Software\TortoiseOverlays\Modified' + <RegistryValue + Root='HKLM' Key='Software\TortoiseOverlays\Modified'   Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgModified)'   />   <RegistryValue - Root='HKMU' Key='Software\TortoiseOverlays\Unversioned' + Root='HKLM' Key='Software\TortoiseOverlays\Unversioned'   Type='string' Name='TortoiseHgMsi' Value='$(var.CLSID_TortoiseHgUnversioned)'   />     <!-- Mark all as approved -->   <RegistryValue - Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' + Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved'   Type='string' Name='$(var.CLSID_TortoiseHgCmenu)' Value='TortoiseHg'   />   <RegistryValue - Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' + Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved'   Type='string' Name='$(var.CLSID_TortoiseHgNormal)' Value='TortoiseHg'   />   <RegistryValue - Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' + Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved'   Type='string' Name='$(var.CLSID_TortoiseHgAdded)' Value='TortoiseHg'   />   <RegistryValue - Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' + Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved'   Type='string' Name='$(var.CLSID_TortoiseHgModified)' Value='TortoiseHg'   />   <RegistryValue - Root='HKMU' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved' + Root='HKLM' Key='Software\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved'   Type='string' Name='$(var.CLSID_TortoiseHgUnversioned)' Value='TortoiseHg'   />  </Include>