[Collab-qa-commits] r334 - fileconflicts

[abi at alioth.debian.org]

Author: abi
Date: 2007-07-12 07:05:50 +0000 (Thu, 12 Jul 2007)
New Revision: 334

Modified:
   fileconflicts/unstable-whitelist
Log:
...

Modified: fileconflicts/unstable-whitelist
===================================================================
--- fileconflicts/unstable-whitelist	2007-07-11 10:58:14 UTC (rev 333)
+++ fileconflicts/unstable-whitelist	2007-07-12 07:05:50 UTC (rev 334)
@@ -54,19 +54,14 @@
 nvidia-kernel-2.6.18-4-686:nvidia-kernel-legacy-2.6.18-4-686
 dvipsk-ja:texlive-chemistry
 dvipsk-ja:texlive-base-bin
-mesa-common-dev:nvidia-glx-legacy-96xx-dev 
-mesa-common-dev:nvidia-glx-dev
+nvidia-glx-legacy-96xx-dev 
+nvidia-glx-dev
+mesa-common-dev
 gstreamer0.10-plugins-bad:gstreamer0.10-plugins-good
-nvidia-glx:nvidia-glx-legacy-96xx
-nvidia-glx:nvidia-glx-legacy-71xx
-nvidia-kernel-2.6.18-4-k7:nvidia-kernel-legacy-96xx-2.6.18-4-k7
-nvidia-kernel-2.6.18-4-k7:nvidia-kernel-legacy-71xx-2.6.18-4-k7
-mesa-common-dev:nvidia-glx-legacy-96xx-dev
-mesa-common-dev:nvidia-glx-legacy-71xx-dev
-nvidia-kernel-2.6.18-4-686:nvidia-kernel-legacy-96xx-2.6.18-4-686
-nvidia-kernel-2.6.18-4-686:nvidia-kernel-legacy-71xx-2.6.18-4-686
-nvidia-glx-dev:nvidia-glx-legacy-96xx-dev
-nvidia-glx-dev:nvidia-glx-legacy-71xx-dev
+nvidia-glx
+nvidia-glx
+nvidia-kernel-2.6.18-4-k7
+nvidia-kernel-2.6.18-4-686
 x11proto-gl-dev:nvidia-glx-legacy-71xx-dev
 nvidia-glx-dev:nvidia-glx-legacy-96xx-dev
 texlive-science:texlive-extra-utils