diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-06-27 11:56:45 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2017-06-27 18:59:39 +0000 |
| commit | 5997e8e1980ea9981e28a5abe73d1b8718d03041 (patch) | |
| tree | be81a6007b0dc4d3def0e924ba05ed561bbc879d /epan | |
| parent | a6652a27783b59d23dca3405b0399690f38f3402 (diff) | |
| download | wireshark-5997e8e1980ea9981e28a5abe73d1b8718d03041.tar.gz | |
WiX: More merge module fixups.
Look for our merge module using find_path. This should be more reliable
and doesn't assume our build and target platforms are the same.
Change-Id: I95a4454a063af2f978550b8cf1f1624c4aeb5ebc
Reviewed-on: https://code.wireshark.org/review/22426
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan')
0 files changed, 0 insertions, 0 deletions