[WiX-commits] wix/bin zip.build,1.13,1.14

[Rob M. <ro...@us...>]

Update of /cvsroot/wix/wix/bin
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv19294/bin

Modified Files:
	zip.build 
Log Message:
PMarcu: Fix sfbug:1584797 Adding better error message for unexpected merge
        failures to point to the merge log.

BobArnso: Fix sfbug:1558416 - Manifests without assembly/assemblyIdentity
          elements would hang the binder.

PMarcu: Adding Torch.exe to the release zips and to the wix setup.

Robmen: SFBUG:1622346 - correctly modularize IIsWebLog.Format column.

Index: zip.build
===================================================================
RCS file: /cvsroot/wix/wix/bin/zip.build,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** zip.build	13 Dec 2006 07:44:19 -0000	1.13
--- zip.build	5 Jan 2007 07:54:19 -0000	1.14
***************
*** 79,82 ****
--- 79,84 ----
          <include name="smoke.exe" />
          <include name="smoke.exe.config" />
+         <include name="torch.exe" />
+         <include name="torch.exe.config" />
          <include name="wconsole.dll" />
          <include name="winterop.dll" />