[Collab-qa-commits] r470 - fileconflicts

[abi at alioth.debian.org]

Author: abi
Date: 2007-10-04 12:05:23 +0000 (Thu, 04 Oct 2007)
New Revision: 470

Modified:
   fileconflicts/unstable-whitelist
Log:
more whitelist

Modified: fileconflicts/unstable-whitelist
===================================================================
--- fileconflicts/unstable-whitelist	2007-10-02 20:43:38 UTC (rev 469)
+++ fileconflicts/unstable-whitelist	2007-10-04 12:05:23 UTC (rev 470)
@@ -89,3 +89,5 @@
 ion3-mod-xinerama:mod-xinerama-for-ion
 asterisk-sounds-extra:asterisk-sounds-main
 centericq-common:centerim-common
+cl-cffi:cl-uffi
+python-pysqlite1.1-dbg:python-sqlite-dbg