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

[Ardo van Rangelrooij]

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

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

Modified Files:
	Makefile.in configure configure.in 
Log Message:
resolved merge conflicts
===================================================================
File: Makefile.in      	Status: Up-to-date

   Working revision:	1.4	Mon Oct 18 03:21:46 2004
   Repository revision:	1.4	/cvsroot/debian-xml-sgml/packages/expat/Makefile.in,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)

===================================================================
File: configure        	Status: Up-to-date

   Working revision:	1.5	Mon Oct 18 03:21:54 2004
   Repository revision:	1.5	/cvsroot/debian-xml-sgml/packages/expat/configure,v
   Sticky Options:	-ko

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

===================================================================
File: configure.in     	Status: Up-to-date

   Working revision:	1.5	Mon Oct 18 03:21:54 2004
   Repository revision:	1.5	/cvsroot/debian-xml-sgml/packages/expat/configure.in,v
   Sticky Options:	-ko

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