annotate contrib/wix/COPYING.rtf @ 27136:29b08ca680b0

test-merge-changedelete.t: print out debugmergestate We're going to use this to verify the merge state in upcoming patches.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 25 Nov 2015 14:26:46 -0800
parents 8fe5fc8d7b8e
children f6d73c8756e2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
24191
8fe5fc8d7b8e copyright: update to 2015
Jesus Cea <jcea@jcea.es>
parents: 15782
diff changeset
1 (binary:application/rtf)