summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlastair Tse <liquidx@gentoo.org>2003-10-13 20:46:38 +0000
committerAlastair Tse <liquidx@gentoo.org>2003-10-13 20:46:38 +0000
commitb6255895fe70c0c79e181540a773ae83dd233185 (patch)
treead9b80424874f19e702d8a18024dbe105164da13 /media-libs/libgphoto2/ChangeLog
parentbad tarball =/ (diff)
downloadgentoo-2-b6255895fe70c0c79e181540a773ae83dd233185.tar.gz
gentoo-2-b6255895fe70c0c79e181540a773ae83dd233185.tar.bz2
gentoo-2-b6255895fe70c0c79e181540a773ae83dd233185.zip
fix patch errors
Diffstat (limited to 'media-libs/libgphoto2/ChangeLog')
-rw-r--r--media-libs/libgphoto2/ChangeLog6
1 files changed, 5 insertions, 1 deletions
diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 4942b0076ccf..194e5075fa2a 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libgphoto2
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.13 2003/10/12 19:41:18 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.14 2003/10/13 20:46:26 liquidx Exp $
+
+ 13 Oct 2003; Alastair Tse <liquidx@gentoo.org>
+ files/libgphoto2-2.1.2-canon.patch:
+ fix cvs ids conflict in canon patch
13 Oct 2003; Martin Holzer <mholzer@gentoo.org> libgphoto2-2.1.2-r1.ebuild,
files/libgphoto2-2.1.2-canon.patch: