Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in profiles: package.mask
Date: Sat, 23 Jan 2010 15:28:04
Message-Id: E1NYhu4-0005Dj-No@stork.gentoo.org
1 scarabeus 10/01/23 15:28:00
2
3 Modified: package.mask
4 Log:
5 Remove wrongly merged collision.
6
7 Revision Changes Path
8 1.11146 profiles/package.mask
9
10 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/package.mask?rev=1.11146&view=markup
11 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/package.mask?rev=1.11146&content-type=text/plain
12 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/profiles/package.mask?r1=1.11145&r2=1.11146
13
14 Index: package.mask
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/profiles/package.mask,v
17 retrieving revision 1.11145
18 retrieving revision 1.11146
19 diff -u -r1.11145 -r1.11146
20 --- package.mask 23 Jan 2010 15:06:23 -0000 1.11145
21 +++ package.mask 23 Jan 2010 15:27:59 -0000 1.11146
22 @@ -1,5 +1,5 @@
23 ####################################################################
24 -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11145 2010/01/23 15:06:23 scarabeus Exp $
25 +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11146 2010/01/23 15:27:59 scarabeus Exp $
26 #
27 # When you add an entry to the top of this file, add your name, the date, and
28 # an explanation of why something is getting masked. Please be extremely
29 @@ -622,10 +622,6 @@
30 # Beta versions of sudo
31 =app-admin/sudo-1.7.3_beta*
32
33 -# Luca Barbato <lu_zero@g.o (07 Dec 2009)
34 -# bad regression https://bugs.gentoo.org/287725
35 -=media-libs/netpbm-10.48.00
36 -
37 # Diego E. Pettenò <flameeyes@g.o> (06 Dec 2009)
38 # on behalf of QA team
39 #