[Collab-qa-commits] r134 - fileconflicts

[Michael Ablassmeier]

Author: abi
Date: 2007-05-10 07:42:33 +0000 (Thu, 10 May 2007)
New Revision: 134

Modified:
   fileconflicts/unstable-whitelist
Log:
some more whitelists

Modified: fileconflicts/unstable-whitelist
===================================================================
--- fileconflicts/unstable-whitelist	2007-05-09 09:05:05 UTC (rev 133)
+++ fileconflicts/unstable-whitelist	2007-05-10 07:42:33 UTC (rev 134)
@@ -118,3 +118,6 @@
 libqt4-ruby1.8
 libasm-dev
 libelfsh0-dev
+manpages-tr
+libblitz0
+libufsparse-dbg