Merge Opie-Console_CVS Conflict

[vuplus_openembedded] / opie-ubrowser / opie-ubrowser_cvs.oe

diff --git a/opie-ubrowser/opie-ubrowser_cvs.oe b/opie-ubrowser/opie-ubrowser_cvs.oe
index f56727e..35f393a 100644 (file)
--- a/opie-ubrowser/opie-ubrowser_cvs.oe
+++ b/opie-ubrowser/opie-ubrowser_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/applications"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
-PV = "1.1.5-cvs-${CVSDATE}"
+PV = "1.1.6-cvs-${CVSDATE}"
 APPNAME = "ubrowser"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/net/ubrowser \