Merge Opie-Console_CVS Conflict

[vuplus_openembedded] / opie-today-stocktickerplugin / opie-today-stocktickerplugin_cvs.oe

diff --git a/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.oe b/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.oe
index c3810c8..4f51d80 100644 (file)
--- a/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.oe
+++ b/opie-today-stocktickerplugin/opie-today-stocktickerplugin_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "opie-today libqtaux2"
-PV = "1.1.5-cvs-${CVSDATE}"
+PV = "1.1.6-cvs-${CVSDATE}"
 APPNAME = "todaystocktickerplugin"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/todayplugins/stockticker \