Merge Opie-Console_CVS Conflict

[vuplus_openembedded] / opie-citytime / opie-citytime_cvs.oe

diff --git a/opie-citytime/opie-citytime_cvs.oe b/opie-citytime/opie-citytime_cvs.oe
index 17f5b11..1b2c524 100644 (file)
--- a/opie-citytime/opie-citytime_cvs.oe
+++ b/opie-citytime/opie-citytime_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 RRECOMMENDS = "timezones"
-PV = "1.1.5-cvs-${CVSDATE}"
+PV = "1.1.6-cvs-${CVSDATE}"
 
 APPNAME = "citytime"