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

[Samuel Verstraete]

Author: elangelo
Date: 2006-10-10 14:25:48 +0000 (Tue, 10 Oct 2006)
New Revision: 21735

Modified:
   moonbase/trunk/x11/NVIDIA-old/CONFLICTS
   moonbase/trunk/x11/NVIDIA/CONFLICTS
Log:
updating CONFLICTS
gr,S.


Modified: moonbase/trunk/x11/NVIDIA/CONFLICTS
===================================================================
--- moonbase/trunk/x11/NVIDIA/CONFLICTS	2006-10-10 14:25:31 UTC (rev 21734)
+++ moonbase/trunk/x11/NVIDIA/CONFLICTS	2006-10-10 14:25:48 UTC (rev 21735)
@@ -1 +1,2 @@
 conflicts NVIDIA-old
+conflicts NVIDIA-beta

Modified: moonbase/trunk/x11/NVIDIA-old/CONFLICTS
===================================================================
--- moonbase/trunk/x11/NVIDIA-old/CONFLICTS	2006-10-10 14:25:31 UTC (rev 21734)
+++ moonbase/trunk/x11/NVIDIA-old/CONFLICTS	2006-10-10 14:25:48 UTC (rev 21735)
@@ -1 +1,2 @@
 conflicts NVIDIA
+conflicts NVIDIA-beta