summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-libs/glibc/ChangeLog')
-rw-r--r--sys-libs/glibc/ChangeLog5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index dfee6e900505..4ef19e952edd 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-libs/glibc
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.993 2014/06/14 08:07:10 rhill Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.994 2014/06/14 22:19:10 vapier Exp $
+
+ 14 Jun 2014; Mike Frysinger <vapier@gentoo.org> files/eblits/pkg_setup.eblit:
+ Check MERGE_TYPE when doing downgrade check #255109 by Phil White.
14 Jun 2014; Ryan Hill <rhill@gentoo.org> files/eblits/common.eblit:
Strip -fstack-protector*. These flags are now enabled by default so we can