[Lunar-commits] r24216 - in moonbase/trunk/x11: NVIDIA NVIDIA-old

[Florin Braescu]

Author: florin
Date: 2007-04-26 15:14:08 +0200 (Thu, 26 Apr 2007)
New Revision: 24216

Modified:
   moonbase/trunk/x11/NVIDIA-old/CONFLICTS
   moonbase/trunk/x11/NVIDIA/CONFLICTS
Log:
put back the conflict on NVIDIA-beta as zbiggy added it to the moonbase :).

Modified: moonbase/trunk/x11/NVIDIA/CONFLICTS
===================================================================
--- moonbase/trunk/x11/NVIDIA/CONFLICTS	2007-04-26 12:58:42 UTC (rev 24215)
+++ moonbase/trunk/x11/NVIDIA/CONFLICTS	2007-04-26 13:14:08 UTC (rev 24216)
@@ -1,2 +1,3 @@
 conflicts NVIDIA-old
+conflicts NVIDIA-beta
 conflicts mesa-lib

Modified: moonbase/trunk/x11/NVIDIA-old/CONFLICTS
===================================================================
--- moonbase/trunk/x11/NVIDIA-old/CONFLICTS	2007-04-26 12:58:42 UTC (rev 24215)
+++ moonbase/trunk/x11/NVIDIA-old/CONFLICTS	2007-04-26 13:14:08 UTC (rev 24216)
@@ -1,2 +1,3 @@
 conflicts NVIDIA
+conflicts NVIDIA-beta
 conflicts mesa-lib