mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
Merge with stable
This commit is contained in:
commit
79b5361923
@ -83,12 +83,12 @@
|
||||
|
||||
<Directory Id="DesktopFolder" Name="Desktop" />
|
||||
<Merge Id='VCRuntime' DiskId='1' Language='1033'
|
||||
SourceFile='C:\Program Files\Microsoft SDKs\Windows\v7.0\Redist\VC\microsoft.vcxx.crt.x86_msm.msm' />
|
||||
SourceFile='$(var.VCRedistSrcDir)\microsoft.vcxx.crt.x86_msm.msm' />
|
||||
<Merge Id='VCRuntimePolicy' DiskId='1' Language='1033'
|
||||
SourceFile='C:\Program Files\Microsoft SDKs\Windows\v7.0\Redist\VC\policy.x.xx.microsoft.vcxx.crt.x86_msm.msm' />
|
||||
SourceFile='$(var.VCRedistSrcDir)\policy.x.xx.microsoft.vcxx.crt.x86_msm.msm' />
|
||||
</Directory>
|
||||
|
||||
<Feature Id='Complete' Title='Mercurial $(var.Version)' Description='The complete package'
|
||||
<Feature Id='Complete' Title='Mercurial' Description='The complete package'
|
||||
Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR' >
|
||||
<Feature Id='MainProgram' Title='Program' Description='Mercurial command line app'
|
||||
Level='1' Absent='disallow' >
|
||||
|
Loading…
Reference in New Issue
Block a user