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

[Ardo van Rangelrooij]

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

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

Modified Files:
	TODO changelog 
Log Message:
resolved merge conflicts
===================================================================
File: TODO             	Status: Up-to-date

   Working revision:	1.2	Mon Oct 18 03:21:54 2004
   Repository revision:	1.2	/cvsroot/debian-xml-sgml/packages/expat/debian/TODO,v

   Existing Tags:
	debian_version_1_95_7-1  	(revision: 1.1)
	debian_version_1_95_6-8  	(revision: 1.1)
	debian_version_1_95_6-7  	(revision: 1.1)
	debian_version_1_95_6-6  	(revision: 1.1)

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

   Working revision:	1.6	Mon Oct 18 03:21:54 2004
   Repository revision:	1.6	/cvsroot/debian-xml-sgml/packages/expat/debian/changelog,v

   Existing Tags:
	debian_version_1_95_7-1  	(revision: 1.5)
	debian_version_1_95_6-8  	(revision: 1.3)
	debian_version_1_95_6-7  	(revision: 1.2)
	debian_version_1_95_6-6  	(revision: 1.1)