Merge Opie-Console_CVS Conflict

[vuplus_openembedded] / opie-mediaplayer1-libmadplugin / opie-mediaplayer1-libmadplugin_cvs.oe

diff --git a/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.oe b/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.oe
index 96ce2d1..4e9f60e 100644 (file)
--- a/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.oe
+++ b/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.oe
@@ -5,7 +5,7 @@ MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
 DEPENDS = "opie-mediaplayer1 libmad"
 RDEPENDS = "opie-mediaplayer1"
-PV = "1.1.5-cvs-${CVSDATE}"
+PV = "1.1.6-cvs-${CVSDATE}"
 APPNAME = "madplugin"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/multimedia/opieplayer \