[Collab-qa-commits] r108 - fileconflicts

[Michael Ablassmeier]

Author: abi
Date: 2007-05-07 06:39:54 +0000 (Mon, 07 May 2007)
New Revision: 108

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

Modified: fileconflicts/unstable-whitelist
===================================================================
--- fileconflicts/unstable-whitelist	2007-05-06 11:06:53 UTC (rev 107)
+++ fileconflicts/unstable-whitelist	2007-05-07 06:39:54 UTC (rev 108)
@@ -114,3 +114,7 @@
 libcunit1-ncurses-dev
 libtododb-dev 
 libtododb0-dev
+libqt0-ruby1.8
+libqt4-ruby1.8
+libasm-dev
+libelfsh0-dev