Mercurial > hg

annotate contrib/wix/defines.wxi @ 27048:86290f6f6599

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate._resolve: handle change/delete conflicts We will represent a deleted file as 'nullhex' in the in-memory and on-disk merge states. We need to be able to create absentfilectxes in that case, and delete the file from disk rather than try to write it out.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 20 Nov 2015 01:14:15 -0800
parents bd9bc4123920
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
13042
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
1 <Include>
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
2
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
3 <?if $(var.Platform) = "x64" ?>
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
4 <?define IsX64 = yes ?>
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
5 <?else?>
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
6 <?define IsX64 = no ?>
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
7 <?endif?>
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
8
bd9bc4123920 wix: add support for x64 native MSI packages
Steve Borho <steve@borho.org>
parents:
diff changeset
9 </Include>