summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Bar-Lev <alonbl@gentoo.org>2013-05-24 19:35:09 +0000
committerAlon Bar-Lev <alonbl@gentoo.org>2013-05-24 19:35:09 +0000
commit087039a30dde91bc3ad084bc8d7237f13648ea5c (patch)
treecc302aeb6e06bbcfcac16bcc3035e461c5afe8b5 /net-dns/openresolv/ChangeLog
parentSwitch to new git repo (diff)
downloadgentoo-2-087039a30dde91bc3ad084bc8d7237f13648ea5c.tar.gz
gentoo-2-087039a30dde91bc3ad084bc8d7237f13648ea5c.tar.bz2
gentoo-2-087039a30dde91bc3ad084bc8d7237f13648ea5c.zip
Fix conflict with dhcpcd, bug#440614, thanks to Renato Alves
(Portage version: 2.2.0_alpha176/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)
Diffstat (limited to 'net-dns/openresolv/ChangeLog')
-rw-r--r--net-dns/openresolv/ChangeLog8
1 files changed, 7 insertions, 1 deletions
diff --git a/net-dns/openresolv/ChangeLog b/net-dns/openresolv/ChangeLog
index 2f545473b2d3..b12a43b95f07 100644
--- a/net-dns/openresolv/ChangeLog
+++ b/net-dns/openresolv/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-dns/openresolv
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/ChangeLog,v 1.74 2013/05/04 15:36:48 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/ChangeLog,v 1.75 2013/05/24 19:35:09 alonbl Exp $
+
+*openresolv-3.5.4-r3 (24 May 2013)
+
+ 24 May 2013; Alon Bar-Lev <alonbl@gentoo.org>
+ +files/openresolv-3.5.4-config-conflict.patch, +openresolv-3.5.4-r3.ebuild:
+ Fix conflict with dhcpcd, bug#440614, thanks to Renato Alves
*openresolv-3.5.4-r2 (04 May 2013)