Merge Opie-Console_CVS Conflict

[vuplus_openembedded] / opie-keyboard / opie-keyboard_cvs.oe

diff --git a/opie-keyboard/opie-keyboard_cvs.oe b/opie-keyboard/opie-keyboard_cvs.oe
index b2ab249..377f045 100644 (file)
--- a/opie-keyboard/opie-keyboard_cvs.oe
+++ b/opie-keyboard/opie-keyboard_cvs.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "opie-pickboard"
 RDEPENDS = "opie-pickboard"
-PV = "1.1.5-cvs-${CVSDATE}"
+PV = "1.1.6-cvs-${CVSDATE}"
 PR = "r1"
 APPNAME = "qkeyboard"