Merge Opie-Console_CVS Conflict

[vuplus_openembedded] / opie-sysinfo / opie-sysinfo_cvs.oe

diff --git a/opie-sysinfo/opie-sysinfo_cvs.oe b/opie-sysinfo/opie-sysinfo_cvs.oe
index 9546c14..1523215 100644 (file)
--- a/opie-sysinfo/opie-sysinfo_cvs.oe
+++ b/opie-sysinfo/opie-sysinfo_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/settings"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
-PV = "1.1.5-cvs-${CVSDATE}"
+PV = "1.1.6-cvs-${CVSDATE}"
 PR = "r1"
 APPNAME = "sysinfo"