Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv8217/main/finkinfo/kde
Modified Files: Tag: pangocairo-branch kdegraphics3.info Log Message: fix conflict issue Index: kdegraphics3.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdegraphics3.info,v retrieving revision 1.20.2.2 retrieving revision 1.20.2.3 diff -u -d -r1.20.2.2 -r1.20.2.3 --- kdegraphics3.info 26 Mar 2007 15:03:25 -0000 1.20.2.2 +++ kdegraphics3.info 30 Mar 2007 00:28:33 -0000 1.20.2.3 @@ -850,14 +850,10 @@ SplitOff17: << Package: kde-kfile-image-plugins Description: KDE - plugins for graphics file I/O -<<<<<<< kdegraphics3.info - Depends: %N-base (>= %v-%r), poppler-qt3-shlibs (>= 0.5.4-1023) -======= Depends: << %N-base (>= %v-%r), poppler-qt3-shlibs (>= 0.5.1-1) << ->>>>>>> 1.21 Replaces: %N (<< %v-%r) Recommends: %N (>= %v-%r) Files: << ------------------------------------------------------------------------- Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits