Merge Opie-Console_CVS Conflict

[vuplus_openembedded] / opie-securityplugins / opie-securityplugin-blueping_cvs.oe

diff --git a/opie-securityplugins/opie-securityplugin-blueping_cvs.oe b/opie-securityplugins/opie-securityplugin-blueping_cvs.oe
index 111360c..ed2318f 100644 (file)
--- a/opie-securityplugins/opie-securityplugin-blueping_cvs.oe
+++ b/opie-securityplugins/opie-securityplugin-blueping_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/settings"
 PRIORITY = "optional"
 LICENSE = "GPL"
 RDEPENDS = "opie-security bluez-utils"
-PV = "1.1.5-cvs-${CVSDATE}"
+PV = "1.1.6-cvs-${CVSDATE}"
 APPNAME = "multiauthbluepingplugin"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/securityplugins/blueping \