summaryrefslogtreecommitdiff
path: root/mergecap.c
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2017-06-27 10:26:39 -0700
committerGerald Combs <gerald@wireshark.org>2017-06-27 17:34:52 +0000
commit1d3561469bbdb691ad9ea11c50af490adefa5ebd (patch)
treef74b33afc236249eac16425bae084ac018e0da97 /mergecap.c
parentcd635206f039680aca8311c1514f1d44232ee3a1 (diff)
downloadwireshark-1d3561469bbdb691ad9ea11c50af490adefa5ebd.tar.gz
CMake: Fix the WiX search path.
Look for WiX executables in $WIX/bin instead of $WIX. Change-Id: Id55eb8e73403d2beed55d64e9bdc6812308c359f Reviewed-on: https://code.wireshark.org/review/22423 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit a6652a27783b59d23dca3405b0399690f38f3402) Reviewed-on: https://code.wireshark.org/review/22425
Diffstat (limited to 'mergecap.c')
0 files changed, 0 insertions, 0 deletions