Merge Opie-Console_CVS Conflict

[vuplus_openembedded] / opie-dvorak / opie-dvorak_cvs.oe

diff --git a/opie-dvorak/opie-dvorak_cvs.oe b/opie-dvorak/opie-dvorak_cvs.oe
index b33c21d..ef54a1b 100644 (file)
--- a/opie-dvorak/opie-dvorak_cvs.oe
+++ b/opie-dvorak/opie-dvorak_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 = "qdvorak"