Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=78b4ecb10102e9741a96d496bd680de888aa266c
commit 78b4ecb10102e9741a96d496bd680de888aa266c Author: Melko <[email protected]> Date: Sun Sep 9 12:45:55 2012 +0200 pyalsa-1.0.25-1-i686 * fix syntax diff --git a/source/lib-extra/pyalsa/FrugalBuild b/source/lib-extra/pyalsa/FrugalBuild index dfb1882..fbd9df0 100644 --- a/source/lib-extra/pyalsa/FrugalBuild +++ b/source/lib-extra/pyalsa/FrugalBuild @@ -11,10 +11,6 @@ groups=('lib-extra') archs=('i686' 'x86_64') up2date="Flasttar $url" source=(ftp://ftp.alsa-project.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2) -<<<<<<< HEAD -sha1sums=('169e2601f5273ec9ec4100d4ba31114e8a4b6d66') -======= sha1sums=('8eb7e94bf096ca8bd3423214712d4e01f2012eb8') ->>>>>>> parent of c27818f... pyalsa-1.0.26-1-i686 # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
