[Collab-qa-commits] r351 - fileconflicts

[abi at alioth.debian.org]

Author: abi
Date: 2007-07-24 07:30:14 +0000 (Tue, 24 Jul 2007)
New Revision: 351

Modified:
   fileconflicts/unstable-whitelist
Log:
more ..

Modified: fileconflicts/unstable-whitelist
===================================================================
--- fileconflicts/unstable-whitelist	2007-07-23 19:17:58 UTC (rev 350)
+++ fileconflicts/unstable-whitelist	2007-07-24 07:30:14 UTC (rev 351)
@@ -84,3 +84,6 @@
 gaim-dbg
 libgnome-speech-dev
 libao2
+mediawiki1.10-math
+python-pysqlite1.1-db:python-sqlite-dbg
+ion3-mod-xinerama:mod-xinerama-for-ion