Bob Arnson c3ddb8844b Merge branch 'feature4144' of https://git01.codeplex.com/forks/wixsupport/working into WixSupport/working ... Conflicts: History.md		2013-11-27 14:15:39 -05:00
..
DTF	Fix build after major reorg.	2013-10-04 23:56:00 -07:00
Setup	Remove duplicate project reference (with bad condition) for NativeSdkMsi2013.wixproj so you can build on a machine without Visual Studio 2013.	2013-11-05 15:14:11 -05:00
Votive	WIXFeature:4144 - Icons for WiX Visual Studio 2012/2013 templates	2013-11-26 03:33:50 -08:00
burn	An additonal change to allow for Windows XP fix to be compiled conditionally	2013-11-12 11:04:17 +01:00
chm	Merge branch 'Bug4201' of https://git01.codeplex.com/forks/bobarnso/wixdev into wix38	2013-11-25 11:57:01 -08:00
common	Major clean up of WiX Toolset branding strings.	2013-04-30 15:51:40 -07:00
ext	Merge branch 'Bug4198' of https://git01.codeplex.com/forks/bobarnso/wixdev into wix38	2013-11-25 11:55:33 -08:00
libs	Code-review tweaks	2013-10-27 21:51:18 -04:00
tools	Fix build break caused by bad merge during commit 7b80518e72	2013-10-27 02:32:06 -07:00
DTF.sln	Completely remove IA64 from build.	2013-10-03 12:01:14 -07:00
DTF.testrunconfig	RobMen: WiX v3.7	2012-08-21 11:36:08 -07:00
DTF.vsmdi	Change namespaces to prepare for breaking changes.	2012-11-26 00:02:32 -08:00
Tools.sln	Update SLN files for new file layout	2013-10-07 02:09:52 -07:00
Wix.sln	WIXBUG:3830 - Remove obsolete PreProcExampleExtension.	2013-10-24 13:46:29 -04:00
burn.sln	Update SLN files for new file layout	2013-10-07 02:09:52 -07:00
burn.testrunconfig	RobMen: WiX v3.7	2012-08-21 11:36:08 -07:00
burn.vsmdi	RobMen: WiX v3.7	2012-08-21 11:36:08 -07:00
wixarm.proj	Fix parallel build when building wix.proj.	2013-10-04 11:10:55 -07:00