Merge Opie-Console_CVS Conflict

[vuplus_openembedded] / opie-today-addressbookplugin / opie-today-addressbookplugin_cvs.oe

diff --git a/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.oe b/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.oe
index 06e3ac7..ab123fd 100644 (file)
--- a/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.oe
+++ b/opie-today-addressbookplugin/opie-today-addressbookplugin_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/today"
 PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "opie-today"
-PV = "1.1.5-cvs-${CVSDATE}"
+PV = "1.1.6-cvs-${CVSDATE}"
 APPNAME="todayaddressbookplugin"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/pim/today/plugins/addressbook "