[Collab-qa-commits] r248 - fileconflicts

[abi at alioth.debian.org]

Author: abi
Date: 2007-06-25 19:28:30 +0000 (Mon, 25 Jun 2007)
New Revision: 248

Modified:
   fileconflicts/unstable-whitelist
Log:
add some more whitelists

Modified: fileconflicts/unstable-whitelist
===================================================================
--- fileconflicts/unstable-whitelist	2007-06-25 12:44:01 UTC (rev 247)
+++ fileconflicts/unstable-whitelist	2007-06-25 19:28:30 UTC (rev 248)
@@ -5,6 +5,10 @@
 medit:referencer
 lesstif-doc:libmotif-dev
 g++:pentium-builder
+erlang-manpages:erlang-x11
+gstreamer0.10-plugins-bad:gstreamer0.10-plugins-good 
+erlang-manpages:erlang-nox
+nvidia-glx:nvidia-glx-legacy-96xx:nvidia-glx-legacy-71xx
 cyrus-sasl2-dbg:cyrus-sasl2-heimdal-dbg
 loop-aes-utils
 mount