summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriele Giorgetti <stroke@gentoo.org>2002-06-07 17:17:35 +0000
committerGabriele Giorgetti <stroke@gentoo.org>2002-06-07 17:17:35 +0000
commitf6e4065b39d082e32fbe26c1686872eed2a92cca (patch)
tree17fca6c39110df2c8f51310b108d792a0d9101a8 /gnome-base
parentChanged deps for libgnomecanvas-2.0.0 libgnomeui-2.0.0 (diff)
downloadgentoo-2-f6e4065b39d082e32fbe26c1686872eed2a92cca.tar.gz
gentoo-2-f6e4065b39d082e32fbe26c1686872eed2a92cca.tar.bz2
gentoo-2-f6e4065b39d082e32fbe26c1686872eed2a92cca.zip
Fixing a cvs conflict in the ChangeLog
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/libgnomecanvas/ChangeLog3
1 files changed, 1 insertions, 2 deletions
diff --git a/gnome-base/libgnomecanvas/ChangeLog b/gnome-base/libgnomecanvas/ChangeLog
index 522513bef8fe..2ba3d82bacea 100644
--- a/gnome-base/libgnomecanvas/ChangeLog
+++ b/gnome-base/libgnomecanvas/ChangeLog
@@ -1,7 +1,6 @@
# ChangeLog for gnome-base/libgnomecanvas
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomecanvas/ChangeLog,v 1.2 2002/06/07 13:06:37 spider Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomecanvas/ChangeLog,v 1.3 2002/06/07 17:17:35 stroke Exp $
*libgnomecanvas-2.0.0 (07 Jun 2002)
07 Jun 2002; Spider <spider@gentoo.org> libgnomecanvas-2.0.0.ebuild: