Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=00c3fc2e83a20b8ecd975002ec42099d121cd9a1
commit 00c3fc2e83a20b8ecd975002ec42099d121cd9a1 Author: kikadf <[email protected]> Date: Thu Feb 26 13:28:23 2015 +0100 Fix conflict in mplayer diff --git a/source/xapps/mplayer/FrugalBuild b/source/xapps/mplayer/FrugalBuild index eb37ea8..965b5a1 100644 --- a/source/xapps/mplayer/FrugalBuild +++ b/source/xapps/mplayer/FrugalBuild @@ -10,11 +10,7 @@ USE_DEVEL=${USE_DEVEL:-"n"} pkgname=mplayer _F_archive_name=MPlayer pkgver=1.1.1 -<<<<<<< HEAD pkgrel=9 -======= -pkgrel=6 ->>>>>>> 341de97fb84524accfccd92fe4920d9c75511903 pkgdesc="The Movie Player" url="http://www.mplayerhq.hu/"; depends=('a52dec' 'aalib' 'cdparanoia' 'codecs' 'faac' 'faad2' 'gsm' \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
