Gerald Combs 5997e8e198 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>		2017-06-27 18:59:39 +00:00
..
macosx	More OS name cleanups.	2017-04-05 19:27:16 +00:00
nsis	Add dftest to Windows installer.	2017-06-23 14:24:31 +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: More merge module fixups.	2017-06-27 18:59:39 +00:00
Makefile.am	Autotools: Distribute packaging/wix.	2016-09-07 00:02:29 +00:00