[xml/sgml-commit] CVS update: packages/expat
Ardo van Rangelrooij
ardo@haydn.debian.org
Sun, 17 Oct 2004 20:14:38 -0600
Date: Sunday October 17, 2004 @ 20:14
Author: ardo
Update of /cvsroot/debian-xml-sgml/packages/expat
In directory haydn:/tmp/cvs-serv1903
Modified Files:
Makefile.in configure configure.in
Log Message:
resolved merge conflicts
===================================================================
File: Makefile.in Status: Up-to-date
Working revision: 1.3 Mon Oct 18 02:14:28 2004
Repository revision: 1.3 /cvsroot/debian-xml-sgml/packages/expat/Makefile.in,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)
===================================================================
File: configure Status: Up-to-date
Working revision: 1.3 Mon Oct 18 02:14:36 2004
Repository revision: 1.3 /cvsroot/debian-xml-sgml/packages/expat/configure,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)
===================================================================
File: configure.in Status: Up-to-date
Working revision: 1.3 Mon Oct 18 02:14:36 2004
Repository revision: 1.3 /cvsroot/debian-xml-sgml/packages/expat/configure.in,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)