Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph

Merge with stable

Changeset e4592fa06147…

Parents 03bb75578432…

Parents c091e2a0be5f…

by Adrian Buehlmann

Changes to 2 files · Browse files at e4592fa06147 Showing diff from parent 03bb75578432 c091e2a0be5f Diff from another changeset...

Change 1 of 1 Show Entire File win32/​wix/​cmenu-i18n.wxs Stacked
 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?> -<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> - - <?include guids.wxi ?> - <?include defines.wxi ?> - - <?define thgcmenulangs = - cs;da;de;en_GB;en_US;es;fa;fr;he;hr;it;ja;ko;nl;nn;pl;pt;pt_BR;ru;tr;uk;zh_CN;zh_TW - ?> - <!-- lang 'ca' is used for key path --> - - <Fragment> - <DirectoryRef Id="i18ndir"> - <Directory Id="cmenuI18n" Name="cmenu" FileSource="$(var.SourceDir)"> - <Component Id="cmenuI18n" Guid="$(var.cmenuI18n.guid)" Win64='$(var.IsX64)'> - <File Name="thg-cmenu-ca.reg" KeyPath="yes"/> - <?foreach LANG in $(var.thgcmenulangs) ?> - <File Name="thg-cmenu-$(var.LANG).reg" /> - <?endforeach?> - </Component> - </Directory> - </DirectoryRef> - </Fragment> - -</Wix>
Change 1 of 1 Show Entire File win32/​wix/​guids.wxi Stacked
 
36
37
38
39
40
41
42
43
44
 
36
37
38
 
 
 
39
40
41
@@ -36,9 +36,6 @@
  <?define dist.guid = {9A429564-6BA8-4F18-ACCF-59C586364FFC} ?>   <?define imageformats.guid = {056DFB00-3EB1-4ACA-A43B-55CD5004DED1} ?>   - <!-- cmenu-i18n.wxs --> - <?define cmenuI18n.guid = {25A9DAFA-FF37-420C-9958-5920301E293A} ?> -   <!-- icons.wxs -->   <?define Icons.guid = {34369923-9610-461C-9FB3-26CA3A139836} ?>