[Collab-qa-commits] r494 - fileconflicts

[abi at alioth.debian.org]

Author: abi
Date: 2007-10-24 11:13:59 +0000 (Wed, 24 Oct 2007)
New Revision: 494

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

Modified: fileconflicts/unstable-whitelist
===================================================================
--- fileconflicts/unstable-whitelist	2007-10-21 11:03:57 UTC (rev 493)
+++ fileconflicts/unstable-whitelist	2007-10-24 11:13:59 UTC (rev 494)
@@ -91,3 +91,5 @@
 centericq-common:centerim-common
 cl-cffi:cl-uffi
 python-pysqlite1.1-dbg:python-sqlite-dbg
+radiance:radiance-sse3
+libgssapi2:libgssapi2-heimdal