Merge Opie-Console_CVS Conflict

[vuplus_openembedded] / opie-mediaplayer2 / opie-mediaplayer2_cvs.oe

diff --git a/opie-mediaplayer2/opie-mediaplayer2_cvs.oe b/opie-mediaplayer2/opie-mediaplayer2_cvs.oe
index e15f9b4..37e48b3 100644 (file)
--- a/opie-mediaplayer2/opie-mediaplayer2_cvs.oe
+++ b/opie-mediaplayer2/opie-mediaplayer2_cvs.oe
@@ -3,7 +3,7 @@ SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
 MAINTAINER = "Team Opie <opie@handhelds.org>
-PV = "1.1.5-cvs-${CVSDATE}"
+PV = "1.1.6-cvs-${CVSDATE}"
 DEPENDS = "libxine"
 RDEPENDS = "opie-mediaplayer2-skin"
 APPNAME = "opieplayer2"