Merge Opie-Console_CVS Conflict

[vuplus_openembedded] / opie-ftplib / opie-ftplib_cvs.oe

diff --git a/opie-ftplib/opie-ftplib_cvs.oe b/opie-ftplib/opie-ftplib_cvs.oe
index 3b6aa2a..d2acb33 100644 (file)
--- a/opie-ftplib/opie-ftplib_cvs.oe
+++ b/opie-ftplib/opie-ftplib_cvs.oe
@@ -4,7 +4,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
 PRIORITY = "optional"
 LICENSE = "GPL"
 PROVIDES = "libftplib1"
-PV = "1.1.5-cvs-${CVSDATE}"
+PV = "1.1.6-cvs-${CVSDATE}"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/ftplib"
 S = "${WORKDIR}/ftplib"