Gerald Combs 6f2d4c2712 Wix: Look for merge modules in %VCToolsRedistDir%. ... Add "%VCToolsRedistDir%\MergeModules" to the merge module search path. This is required for Visual Studio 2017 here. Change-Id: I91cd1527ae80c85ed304c1233436cae52aa0a501 Reviewed-on: https://code.wireshark.org/review/25782 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>		2018-02-14 05:31:16 +00:00
..
macosx	Process all subdirectories of $pkgplugin as directories of plugins.	2018-02-04 00:58:58 +00:00
nsis	Make the DOCSIS dissector a built-in dissector.	2018-02-13 20:15:19 +00:00
portableapps	Reset file permissions	2018-01-27 18:48:40 +00:00
rpm	Fix RPM build: include the User Guide.	2017-12-13 09:16:38 +00:00
wix	Wix: Look for merge modules in %VCToolsRedistDir%.	2018-02-14 05:31:16 +00:00
Makefile.am	autotools: refresh rpm-package target	2017-10-15 23:32:14 +00:00