Subject: CVS commit: wip/atlas
From: Aleksej Saushev
Date: 2010-05-06 12:23:01
Message id: E1O9yEe-000560-2i@sfp-cvsdas-2.v30.ch3.sourceforge.com

Log Message:
Fix conflict declaration.
Move conflict declaration to the appropriate place.

Files:
RevisionActionfile
1.8modifywip/atlas/Makefile