[Collab-qa-commits] r64 - fileconflicts

[Michael Ablassmeier]

Author: abi
Date: 2007-03-18 18:41:21 +0000 (Sun, 18 Mar 2007)
New Revision: 64

Modified:
   fileconflicts/unstable-whitelist
Log:
add nvidia stuff to unstable whitelist

Modified: fileconflicts/unstable-whitelist
===================================================================
--- fileconflicts/unstable-whitelist	2007-03-18 18:39:31 UTC (rev 63)
+++ fileconflicts/unstable-whitelist	2007-03-18 18:41:21 UTC (rev 64)
@@ -84,3 +84,9 @@
 pgapack
 sun-java5-fonts
 sun-java6-fonts
+nvidia-kernel-2.6.18-4-486
+nvidia-kernel-legacy-2.6.18-4-486
+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