Gerald Combs c89f4c628c 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>		2017-06-17 19:32:37 +00:00
..
macosx	More OS name cleanups.	2017-04-05 19:27:16 +00:00
nsis	NSIS: Add support for Visual Studio 2017.	2017-06-09 17:37:07 +00:00
portableapps	PortableApps: Allow multiple instances.	2016-09-09 22:55:12 +00:00
rpm	Add libxml2 as optional dependency	2017-04-19 10:41:55 +00:00
svr4	Continue to remove $Id$ from top of file	2014-03-31 18:48:06 +00:00
wix	WiX: Fixup merge module configuration.	2017-06-17 19:32:37 +00:00
Makefile.am	Autotools: Distribute packaging/wix.	2016-09-07 00:02:29 +00:00