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

[Ardo van Rangelrooij]

Date:	Sunday October 17, 2004 @ 21:21
Author:	ardo

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

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

   Working revision:	1.4	Mon Oct 18 03:21:55 2004
   Repository revision:	1.4	/cvsroot/debian-xml-sgml/packages/expat/lib/expat.h,v
   Sticky Options:	-ko

   Existing Tags:
	upstream_version_1_95_8  	(revision: 1.1.1.3)
	debian_version_1_95_7-1  	(revision: 1.3)
	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)