Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv10800/devel
Modified Files: cppunit1.10.2.info Log Message: fixing conflict; should have done it right the first time... Index: cppunit1.10.2.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/cppunit1.10.2.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- cppunit1.10.2.info 9 Aug 2006 20:40:11 -0000 1.2 +++ cppunit1.10.2.info 4 Sep 2006 14:13:23 -0000 1.3 @@ -1,6 +1,6 @@ Package: cppunit1.10.2 Version: 1.10.2 -Revision: 1002 +Revision: 1003 GCC: 4.0 Maintainer: None <fink-devel@lists.sourceforge.net> License: LGPL @@ -9,7 +9,7 @@ Depends: %N-shlibs (=%v-%r) BuildDepends: doxygen BuildDependsOnly: True -Conflicts: cppunit, calc +Conflicts: cppunit Replaces: cppunit # Unpack Phase: ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits