[Collab-qa-commits] r303 - fileconflicts

[abi at alioth.debian.org]

Author: abi
Date: 2007-07-05 08:24:19 +0000 (Thu, 05 Jul 2007)
New Revision: 303

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

Modified: fileconflicts/unstable-whitelist
===================================================================
--- fileconflicts/unstable-whitelist	2007-07-05 08:19:37 UTC (rev 302)
+++ fileconflicts/unstable-whitelist	2007-07-05 08:24:19 UTC (rev 303)
@@ -53,6 +53,22 @@
 nvidia-kernel-2.6.18-4-k7:nvidia-kernel-legacy-2.6.18-4-k7
 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
+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
+x11proto-gl-dev:nvidia-glx-legacy-71xx-dev
+nvidia-glx-dev:nvidia-glx-legacy-96xx-dev
 texlive-science:texlive-extra-utils
 texlive-pdfetex:texlive-pstricks
 texlive-latex-recommended:texlive-generic-extra