[Collab-qa-commits] r224 - fileconflicts

[abi at alioth.debian.org]

Author: abi
Date: 2007-06-07 18:36:43 +0000 (Thu, 07 Jun 2007)
New Revision: 224

Added:
   fileconflicts/www/
Modified:
   fileconflicts/testing-whitelist
   fileconflicts/unstable-whitelist
Log:
some more whitelistings..

Modified: fileconflicts/testing-whitelist
===================================================================
--- fileconflicts/testing-whitelist	2007-06-06 07:08:42 UTC (rev 223)
+++ fileconflicts/testing-whitelist	2007-06-07 18:36:43 UTC (rev 224)
@@ -76,3 +76,4 @@
 mediawiki1.9-math
 git-completion 
 stgit
+debreaper

Modified: fileconflicts/unstable-whitelist
===================================================================
--- fileconflicts/unstable-whitelist	2007-06-06 07:08:42 UTC (rev 223)
+++ fileconflicts/unstable-whitelist	2007-06-07 18:36:43 UTC (rev 224)
@@ -124,3 +124,4 @@
 libggzdmod++-dev
 gaim-dbg
 libgnome-speech-dev
+libao2