Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=4b68fb4f655b497db807b9a64f664138867235ab
commit 4b68fb4f655b497db807b9a64f664138867235ab Author: kikadf <[email protected]> Date: Thu Feb 26 13:22:11 2015 +0100 Fix conflict in gejengel diff --git a/source/xmultimedia-extra/gejengel/FrugalBuild b/source/xmultimedia-extra/gejengel/FrugalBuild index 5f2617a..810fea6 100644 --- a/source/xmultimedia-extra/gejengel/FrugalBuild +++ b/source/xmultimedia-extra/gejengel/FrugalBuild @@ -7,11 +7,7 @@ options+=('asneeded') pkgname=gejengel pkgver=0.1.4 -<<<<<<< HEAD pkgrel=12 -======= -pkgrel=11 ->>>>>>> 341de97fb84524accfccd92fe4920d9c75511903 pkgdesc="An audio player which focuses on performance and simplicity" depends=('ffmpeg>=2.5.4' 'alsa-lib' 'sqlite3' 'taglib' 'lastfmlib' \ 'imagemagick>=6.8.9' 'libuuid' 'libtool' 'flac' 'libmad' 'libxdg-basedir' \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
