[Collab-qa-commits] r354 - fileconflicts

[abi at alioth.debian.org]

Author: abi
Date: 2007-08-02 13:30:32 +0000 (Thu, 02 Aug 2007)
New Revision: 354

Modified:
   fileconflicts/unstable-whitelist
Log:
whitelist

Modified: fileconflicts/unstable-whitelist
===================================================================
--- fileconflicts/unstable-whitelist	2007-07-25 17:39:43 UTC (rev 353)
+++ fileconflicts/unstable-whitelist	2007-08-02 13:30:32 UTC (rev 354)
@@ -87,3 +87,4 @@
 mediawiki1.10-math
 python-pysqlite1.1-db:python-sqlite-dbg
 ion3-mod-xinerama:mod-xinerama-for-ion
+asterisk-sounds-extra:asterisk-sounds-main