[Collab-qa-commits] r79 - fileconflicts

[Michael Ablassmeier]

Author: abi
Date: 2007-04-18 17:09:18 +0000 (Wed, 18 Apr 2007)
New Revision: 79

Modified:
   fileconflicts/testing-whitelist
Log:
some more ..

Modified: fileconflicts/testing-whitelist
===================================================================
--- fileconflicts/testing-whitelist	2007-04-18 17:06:27 UTC (rev 78)
+++ fileconflicts/testing-whitelist	2007-04-18 17:09:18 UTC (rev 79)
@@ -70,3 +70,5 @@
 libc6-xen
 nvidia-glx-legacy
 nvidia-glx
+sun-java5-fonts
+sun-java6-fonts