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 01b1f48bd9e1

Parents bfc61ebd3615

Parents ea01ffbf3336

by Adrian Buehlmann

Changes to one file · Browse files at 01b1f48bd9e1 Showing diff from parent bfc61ebd3615 ea01ffbf3336 Diff from another changeset...

 
351
352
353
 
 
 
 
 
354
355
 
 
356
357
358
 
351
352
353
354
355
356
357
358
359
 
360
361
362
363
364
@@ -351,8 +351,14 @@
  </Feature>   </Feature>   <?endif?> + <?if $(var.Platform) = "x64" ?> + <?define ShellExtensionX86level = 1000 ?> + <?else?> + <?define ShellExtensionX86level = 1 ?> + <?endif?>   <Feature Id='ShellExtensionX86' Title='Shell Extension x86' - Level='1' AllowAdvertise='no' + Level='$(var.ShellExtensionX86level)' + Absent='allow' AllowAdvertise='no'   Description='Context menu for 32-bit processes'>   <ComponentGroupRef Id='cmenuI18n' />   <ComponentRef Id='thgshellx86dll' />