[Collab-qa-commits] r513 - fileconflicts

[abi at alioth.debian.org]

Author: abi
Date: 2007-11-19 08:31:07 +0000 (Mon, 19 Nov 2007)
New Revision: 513

Modified:
   fileconflicts/unstable-whitelist
Log:
more whitelist

Modified: fileconflicts/unstable-whitelist
===================================================================
--- fileconflicts/unstable-whitelist	2007-11-18 23:13:56 UTC (rev 512)
+++ fileconflicts/unstable-whitelist	2007-11-19 08:31:07 UTC (rev 513)
@@ -94,3 +94,4 @@
 radiance:radiance-sse3
 libgssapi2:libgssapi2-heimdal
 libhtml-display-perl:libwww-mechanize-shell-perl
+gstreamer0.10-pulseaudio:libgstreamer-plugins-pulse0.10-0