Merge Opie-Console_CVS Conflict

[vuplus_openembedded] / opie-deco-polished / opie-deco-polished_cvs.oe

diff --git a/opie-deco-polished/opie-deco-polished_cvs.oe b/opie-deco-polished/opie-deco-polished_cvs.oe
index 9a94b8e..d8e4b42 100644 (file)
--- a/opie-deco-polished/opie-deco-polished_cvs.oe
+++ b/opie-deco-polished/opie-deco-polished_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/decorations"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
-PV = "1.1.5-cvs-${CVSDATE}"
+PV = "1.1.6-cvs-${CVSDATE}"
 APPNAME = "polished"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/decorations/polished "