[Collab-qa-commits] r679 - fileconflicts

[abi at alioth.debian.org]

Author: abi
Date: 2008-01-28 12:31:10 +0000 (Mon, 28 Jan 2008)
New Revision: 679

Modified:
   fileconflicts/unstable-whitelist
Log:
some whitelisting

Modified: fileconflicts/unstable-whitelist
===================================================================
--- fileconflicts/unstable-whitelist	2008-01-28 05:31:35 UTC (rev 678)
+++ fileconflicts/unstable-whitelist	2008-01-28 12:31:10 UTC (rev 679)
@@ -101,3 +101,8 @@
 firebird1.5-classic:firebird1.5-super
 libomniorb4-1:libomniorb4c2
 gnustep-dl2:libsope-core4.4-dev
+g++-4.3:hardening-wrapper 
+g++-4.2:hardening-wrapper
+gcc-4.3:hardening-wrapper
+gcc-4.2:hardening-wrapper
+g++-4.1:hardening-wrapper