Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=49365df2779c14bbff0b0f8c9c27efc6e9f75757
commit 49365df2779c14bbff0b0f8c9c27efc6e9f75757 Author: kikadf <[email protected]> Date: Thu Feb 26 13:15:19 2015 +0100 Fix conflict in lives diff --git a/source/xapps-extra/lives/FrugalBuild b/source/xapps-extra/lives/FrugalBuild index 7efdef8..1cefbae 100644 --- a/source/xapps-extra/lives/FrugalBuild +++ b/source/xapps-extra/lives/FrugalBuild @@ -7,11 +7,7 @@ options+=('asneeded') pkgname=lives pkgver=2.2.7 -<<<<<<< HEAD pkgrel=3 -======= -pkgrel=2 ->>>>>>> 341de97fb84524accfccd92fe4920d9c75511903 pkgdesc="LiVES is a powerful video system aimed at the digital video artist and VJ." depends=('mplayer>=1.0rc3-1' 'imagemagick>=6.7.9_2-1' 'gtk+2>=2.20.0-2' 'libjpeg>=8a' 'sox>=14.3.0' 'transcode>=1.1.7' \ 'libavc1394' 'freetype2' 'libvisual-plugins' 'sdl' 'liboil' 'jack' 'procps' 'libtirpc' 'libpulse>=6.0') _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
