[Collab-qa-commits] r94 - fileconflicts

[Michael Ablassmeier]

Author: abi
Date: 2007-04-26 09:04:48 +0000 (Thu, 26 Apr 2007)
New Revision: 94

Modified:
   fileconflicts/testing-whitelist
   fileconflicts/unstable-whitelist
Log:
some more whitelisting

Modified: fileconflicts/testing-whitelist
===================================================================
--- fileconflicts/testing-whitelist	2007-04-25 17:01:08 UTC (rev 93)
+++ fileconflicts/testing-whitelist	2007-04-26 09:04:48 UTC (rev 94)
@@ -72,3 +72,5 @@
 nvidia-glx
 sun-java5-fonts
 sun-java6-fonts
+mediawiki1.7-math
+mediawiki1.9-math

Modified: fileconflicts/unstable-whitelist
===================================================================
--- fileconflicts/unstable-whitelist	2007-04-25 17:01:08 UTC (rev 93)
+++ fileconflicts/unstable-whitelist	2007-04-26 09:04:48 UTC (rev 94)
@@ -91,3 +91,14 @@
 nvidia-kernel-2.6.18-4-686
 nvidia-kernel-legacy-2.6.18-4-686
 dvipsk-ja
+texlive-chemistry
+texlive-science 
+texlive-extra-utils
+texlive-pdfetex
+texlive-pstricks
+texlive-latex-recommended
+texlive-generic-extra
+mediawiki1.7-math
+mediawiki1.9-math
+capplets-data
+libgnomekbd-common