[gentoo-commits] gentoo-x86 commit in profiles: package.mask

[Christian Ruppert (idl0r)]

idl0r       12/03/04 00:46:22

  Modified:             package.mask
  Log:
  The colliding parts have been disabled

Revision  Changes    Path
1.13543              profiles/package.mask

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/package.mask?rev=1.13543&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/package.mask?rev=1.13543&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/package.mask?r1=1.13542&r2=1.13543

Index: package.mask
===================================================================
RCS file: /var/cvsroot/gentoo-x86/profiles/package.mask,v
retrieving revision 1.13542
retrieving revision 1.13543
diff -u -r1.13542 -r1.13543
--- package.mask	3 Mar 2012 18:48:45 -0000	1.13542
+++ package.mask	4 Mar 2012 00:46:21 -0000	1.13543
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13542 2012/03/03 18:48:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13543 2012/03/04 00:46:21 idl0r 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
@@ -69,10 +69,6 @@
 dev-php/PEAR-Image_Color
 dev-php/PEAR-Image_Canvas
 
-# Doug Goldstein <cardoe@g.o> (20 Feb 2012)
-# Installs stuff over the top of nvidia-drivers
-=media-video/nvidia-settings-295.20
-
 # Samuli Suominen <ssuominen@g.o> (20 Feb 2012)
 # Mask what will be the Xfce Desktop Environment 4.10 for testing
 >=xfce-base/exo-0.7.0