summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkinori Hattori <hattya@gentoo.org>2014-06-13 14:19:43 +0000
committerAkinori Hattori <hattya@gentoo.org>2014-06-13 14:19:43 +0000
commitdb4ebd682b59ec9927d02ab44064a0cfdc619ccb (patch)
treeed59472a7cd76cddc0f6103cfe358b16c2104259
parentadded multilib-converted nspr to package.mask for testing (diff)
downloadgentoo-2-db4ebd682b59ec9927d02ab44064a0cfdc619ccb.tar.gz
gentoo-2-db4ebd682b59ec9927d02ab44064a0cfdc619ccb.tar.bz2
gentoo-2-db4ebd682b59ec9927d02ab44064a0cfdc619ccb.zip
merge duplicate entries
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key EC917A6D)
-rw-r--r--dev-python/requests/ChangeLog9
1 files changed, 3 insertions, 6 deletions
diff --git a/dev-python/requests/ChangeLog b/dev-python/requests/ChangeLog
index 581d555bb8ac..a27b827b04b2 100644
--- a/dev-python/requests/ChangeLog
+++ b/dev-python/requests/ChangeLog
@@ -1,13 +1,10 @@
# ChangeLog for dev-python/requests
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/ChangeLog,v 1.60 2014/06/08 17:12:08 hattya Exp $
-
- 08 Jun 2014; Akinori Hattori <hattya@gentoo.org> requests-2.2.0.ebuild,
- requests-2.2.1.ebuild, requests-2.3.0.ebuild:
- keyword ~ia64 wrt bug #509628
+# $Header: /var/cvsroot/gentoo-x86/dev-python/requests/ChangeLog,v 1.61 2014/06/13 14:19:43 hattya Exp $
08 Jun 2014; Akinori Hattori <hattya@gentoo.org> requests-1.2.2.ebuild,
- requests-1.2.3.ebuild, requests-2.0.0.ebuild, requests-2.1.0.ebuild:
+ requests-1.2.3.ebuild, requests-2.0.0.ebuild, requests-2.1.0.ebuild,
+ requests-2.2.0.ebuild, requests-2.2.1.ebuild, requests-2.3.0.ebuild:
keyword ~ia64 wrt bug #509628
05 Jun 2014; Fabian Groffen <grobian@gentoo.org> requests-2.3.0.ebuild: