summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask6
2 files changed, 5 insertions, 6 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index e918e10a6613..27c1822d82c5 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7131 2012/11/10 05:32:49 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7132 2012/11/10 07:12:52 vapier Exp $
#
# This ChangeLog should include records for all changes in profiles directory.
# Only typo fixes which don't affect portage/repoman behaviour could be avoided
# here. If in doubt put a record here!
+ 10 Nov 2012; Mike Frysinger <vapier@gentoo.org> package.mask:
+ Drop u-boot-tools mask.
+
10 Nov 2012; Alexandre Rostovtsev <tetromino@gentoo.org> package.mask:
Add gdk-pixbuf-2.26.5 to gnome-3.6 mask.
diff --git a/profiles/package.mask b/profiles/package.mask
index 5e1371116e05..e9dc636abcc2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14213 2012/11/10 05:32:49 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14214 2012/11/10 07:12:52 vapier Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -35,10 +35,6 @@
# Masked for testing, bug #438756.
>=net-libs/libsrtp-1.4.4_p20121108
-# Markos Chandras <hwoarang@gentoo.org> (09 Nov 2012)
-# Masked for testing
-=dev-embedded/u-boot-tools-2012.07
-
# Pawel Hajdan jr <phajdan.jr@gentoo.org> (08 Nov 2012)
# Dev channel releases are only for people who are developers or want more
# experimental features and accept a more unstable release.