summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-03-15 14:39:41 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-03-15 14:39:41 +0000
commite480f56e090e8d9f78ab15eaa5485a9a3ca21c5d (patch)
treed9416d5a487ce2c5d71fc6a57e99da1baa6eb0e0 /kde-base/libkonq/ChangeLog
parentMarking gimp-help-2.4.2 ppc64 for bug 252653 (diff)
downloadgentoo-2-e480f56e090e8d9f78ab15eaa5485a9a3ca21c5d.tar.gz
gentoo-2-e480f56e090e8d9f78ab15eaa5485a9a3ca21c5d.tar.bz2
gentoo-2-e480f56e090e8d9f78ab15eaa5485a9a3ca21c5d.zip
Automatic-merge: merge updates for 4.2.1 from kde-testing.
(Portage version: 2.2_rc25/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/libkonq/ChangeLog')
-rw-r--r--kde-base/libkonq/ChangeLog5
1 files changed, 4 insertions, 1 deletions
diff --git a/kde-base/libkonq/ChangeLog b/kde-base/libkonq/ChangeLog
index f072b2d0406e..7f870fa55e2a 100644
--- a/kde-base/libkonq/ChangeLog
+++ b/kde-base/libkonq/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for kde-base/libkonq
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/ChangeLog,v 1.111 2009/03/08 22:56:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/ChangeLog,v 1.112 2009/03/15 14:39:41 scarabeus Exp $
+
+ 15 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> libkonq-4.2.1.ebuild:
+ Automatic-merge: merge updates for 4.2.1 from kde-testing.
08 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org> libkonq-4.2.1.ebuild:
Revert wrongly commited new eclass behavior.