[xml/sgml-commit] CVS update: packages/expat/xmlwf

[Ardo van Rangelrooij]

Date:	Sunday October 17, 2004 @ 20:14
Author:	ardo

Update of /cvsroot/debian-xml-sgml/packages/expat/xmlwf
In directory haydn:/tmp/cvs-serv1903/xmlwf

Modified Files:
	xmlwf.c 
Log Message:
resolved merge conflicts
===================================================================
File: xmlwf.c          	Status: Up-to-date

   Working revision:	1.3	Mon Oct 18 02:14:38 2004
   Repository revision:	1.3	/cvsroot/debian-xml-sgml/packages/expat/xmlwf/xmlwf.c,v
   Sticky Options:	-ko

   Existing Tags:
	upstream_version_1_95_7  	(revision: 1.1.1.2)
	debian_version_1_95_6-8  	(revision: 1.2)
	debian_version_1_95_6-7  	(revision: 1.2)
	debian_version_1_95_6-6  	(revision: 1.2)
	upstream_version_1_95_6  	(revision: 1.1.1.1)
	source-dist              	(branch: 1.1.1)