Merge Opie-Console_CVS Conflict

[vuplus_openembedded] / opie-vmemo / opie-vmemo_cvs.oe

diff --git a/opie-vmemo/opie-vmemo_cvs.oe b/opie-vmemo/opie-vmemo_cvs.oe
index 18ced7b..a575a9a 100644 (file)
--- a/opie-vmemo/opie-vmemo_cvs.oe
+++ b/opie-vmemo/opie-vmemo_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 RDEPENDS = "opie-vmemo-settings"
-PV = "1.1.5-cvs-${CVSDATE}"
+PV = "1.1.6-cvs-${CVSDATE}"
 APPNAME = "vmemoapplet"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/applets/vmemo \