[Collab-qa-commits] r98 - fileconflicts

[Michael Ablassmeier]

Author: abi
Date: 2007-04-30 07:47:37 +0000 (Mon, 30 Apr 2007)
New Revision: 98

Modified:
   fileconflicts/unstable-whitelist
Log:
whitelist

Modified: fileconflicts/unstable-whitelist
===================================================================
--- fileconflicts/unstable-whitelist	2007-04-29 14:55:58 UTC (rev 97)
+++ fileconflicts/unstable-whitelist	2007-04-30 07:47:37 UTC (rev 98)
@@ -108,3 +108,9 @@
 libgnomeui-0
 git-completion
 stgit
+gij-4.1
+libgcj7-0
+libcunit1-dev
+libcunit1-ncurses-dev
+libtododb-dev 
+libtododb0-dev