diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-06-17 11:15:18 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2017-06-27 17:34:42 +0000 |
| commit | cd635206f039680aca8311c1514f1d44232ee3a1 (patch) | |
| tree | e50db02b6bce46805f15478925fe67870edda6a6 /fix | |
| parent | 89431bce5373fec79aea03bef9fa25908d92f7f4 (diff) | |
| download | wireshark-cd635206f039680aca8311c1514f1d44232ee3a1.tar.gz | |
WiX: Fixup merge module configuration.
Set the merge module path based on our platform and version of Visual
Studio.
Change-Id: Ic866447f36d5264d61fc988f3f9d8b4d2e5c0827
Reviewed-on: https://code.wireshark.org/review/22192
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
(cherry picked from commit c89f4c628c315e8f472653856a0776469c65f34e)
Reviewed-on: https://code.wireshark.org/review/22424
Diffstat (limited to 'fix')
0 files changed, 0 insertions, 0 deletions