Merge Opie-Console_CVS Conflict

[vuplus_openembedded] / opie-i18n / opie-lrelease-native_cvs.oe

diff --git a/opie-i18n/opie-lrelease-native_cvs.oe b/opie-i18n/opie-lrelease-native_cvs.oe
index 9fd07ac..db46a3d 100644 (file)
--- a/opie-i18n/opie-lrelease-native_cvs.oe
+++ b/opie-i18n/opie-lrelease-native_cvs.oe
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Holger Freyther <zecke@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "uicmoc3-native"
-PV = "1.1.5-cvs-${CVSDATE}"
+PV = "1.1.6-cvs-${CVSDATE}"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/development/translation/opie-lrelease \
            cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/development/translation/shared"