aboutsummaryrefslogtreecommitdiff
path: root/src/test/WixToolsetTest.CoreIntegration/TestData/SimpleMerge (follow)
Commit message (Expand)AuthorAgeFilesLines
* If no Media or MediaTemplate is present, default to a MediaTemplate.Bob Arnson2020-06-221-2/+1
* Support merging merge modulesRob Mensching2020-05-223-0/+35