diff options
| author | Gerald Combs <gerald@wireshark.org> | 2017-06-27 11:56:45 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2017-06-27 20:29:07 +0000 |
| commit | d169cdf644da7c8f995811f9471e84641484aa33 (patch) | |
| tree | bebb8b8978eb1072ddb003ae1b0647796c138744 /register.h | |
| parent | 1d3561469bbdb691ad9ea11c50af490adefa5ebd (diff) | |
| download | wireshark-d169cdf644da7c8f995811f9471e84641484aa33.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>
(cherry picked from commit 5997e8e1980ea9981e28a5abe73d1b8718d03041)
Reviewed-on: https://code.wireshark.org/review/22427
Diffstat (limited to 'register.h')
0 files changed, 0 insertions, 0 deletions