[Collab-qa-commits] r236 - fileconflicts

[abi at alioth.debian.org]

Author: abi
Date: 2007-06-18 10:16:47 +0000 (Mon, 18 Jun 2007)
New Revision: 236

Modified:
   fileconflicts/unstable-whitelist
Log:
lets try new whitelist format

Modified: fileconflicts/unstable-whitelist
===================================================================
--- fileconflicts/unstable-whitelist	2007-06-16 23:03:42 UTC (rev 235)
+++ fileconflicts/unstable-whitelist	2007-06-18 10:16:47 UTC (rev 236)
@@ -1,15 +1,11 @@
-grub
-grub2
-bitchx
-bitchx-ssl
-unace
-unace-nonfree
-xmms
-xmms-mpg123-ja
-lesstif-doc
-libmotif-dev
-g++
-pentium-builder
+grub:grub2
+bitchx:bitchx-ssl
+unace:unace-nonfree
+xmms:xmms-mpg123-ja
+aide:aide-xen
+medit:referencer
+lesstif-doc:libmotif-dev
+g++:pentium-builder
 loop-aes-utils
 mount
 mesa-common-dev