[Collab-qa-commits] r71 - fileconflicts

[Michael Ablassmeier]

Author: abi
Date: 2007-03-21 18:16:53 +0000 (Wed, 21 Mar 2007)
New Revision: 71

Modified:
   fileconflicts/testing-whitelist
Log:
some more nvidida stuff to testing whitelist

Modified: fileconflicts/testing-whitelist
===================================================================
--- fileconflicts/testing-whitelist	2007-03-21 18:13:01 UTC (rev 70)
+++ fileconflicts/testing-whitelist	2007-03-21 18:16:53 UTC (rev 71)
@@ -68,3 +68,5 @@
 nvidia-kernel-legacy-2.6.18-4-686
 libc6-i686
 libc6-xen
+nvidia-glx-legacy
+nvidia-glx