Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kikadftesting.git;a=commitdiff;h=4d071a4b2b8441c3a0813df9602d4dc9f6cef049
commit 4d071a4b2b8441c3a0813df9602d4dc9f6cef049 Author: kikadf <[email protected]> Date: Thu Feb 26 13:23:26 2015 +0100 Fix conflict in qmmp diff --git a/source/xmultimedia-extra/qmmp/FrugalBuild b/source/xmultimedia-extra/qmmp/FrugalBuild index 99743d9..582d5e3 100644 --- a/source/xmultimedia-extra/qmmp/FrugalBuild +++ b/source/xmultimedia-extra/qmmp/FrugalBuild @@ -6,19 +6,11 @@ options+=('asneeded') pkgname=qmmp pkgver=0.8.3 -<<<<<<< HEAD pkgrel=3 pkgdesc="A music player written in Qt that supports Winamp skins." url="http://qmmp.ylsoftware.com"; depends=('libqtgui' 'libqtnetwork' 'libuuid' 'libsamplerate' \ 'libqtdbus' 'ffmpeg>=2.5.1' 'taglib' 'libmpcdec' 'libmad' \ -======= -pkgrel=2 -pkgdesc="A music player written in Qt that supports Winamp skins." -url="http://qmmp.ylsoftware.com"; -depends=('libqtgui' 'libqtnetwork' 'libuuid' 'libsamplerate' \ - 'libqtdbus' 'ffmpeg>=1.0' 'taglib' 'libmpcdec' 'libmad' \ ->>>>>>> 341de97fb84524accfccd92fe4920d9c75511903 'libcdio>=0.83' 'wavpack' 'libmms' 'curl' 'libpulse>=6.0') makedepends=('qt4-linguist' 'libqt3support') groups=('xmultimedia-extra') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
