[Collab-qa-commits] r78 - fileconflicts

[Michael Ablassmeier]

Author: abi
Date: 2007-04-18 17:06:27 +0000 (Wed, 18 Apr 2007)
New Revision: 78

Modified:
   fileconflicts/unstable-whitelist
Log:
whitelist

Modified: fileconflicts/unstable-whitelist
===================================================================
--- fileconflicts/unstable-whitelist	2007-04-18 06:47:38 UTC (rev 77)
+++ fileconflicts/unstable-whitelist	2007-04-18 17:06:27 UTC (rev 78)
@@ -90,3 +90,4 @@
 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