[Collab-qa-commits] r65 - fileconflicts

[Michael Ablassmeier]

Author: abi
Date: 2007-03-18 18:43:12 +0000 (Sun, 18 Mar 2007)
New Revision: 65

Modified:
   fileconflicts/testing-whitelist
Log:
some more whitelistings for testing aswell

Modified: fileconflicts/testing-whitelist
===================================================================
--- fileconflicts/testing-whitelist	2007-03-18 18:41:21 UTC (rev 64)
+++ fileconflicts/testing-whitelist	2007-03-18 18:43:12 UTC (rev 65)
@@ -60,3 +60,11 @@
 nvidia-kernel-legacy-2.6.18-3-686
 cmap-adobe-gb1
 xpdf-chinese-simplified
+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
+libc6-i686
+libc6-xen