diff contrib/wix/templates.wxs @ 28578:66d085e55ecd

filemerge: indicate that local/other are p1/p2
author timeless <timeless@mozdev.org>
date Thu, 17 Mar 2016 00:36:01 +0000
parents 2f63ae140c93
children 04ec317b8128
line wrap: on
line diff