Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=faf88894758192c5d41c4285453c2dac37d1df51
commit faf88894758192c5d41c4285453c2dac37d1df51 Author: kikadf <[email protected]> Date: Thu Feb 26 13:16:42 2015 +0100 Fix conflict in blender diff --git a/source/xapps-extra/blender/FrugalBuild b/source/xapps-extra/blender/FrugalBuild index 76a7d0f..74b386f 100644 --- a/source/xapps-extra/blender/FrugalBuild +++ b/source/xapps-extra/blender/FrugalBuild @@ -26,11 +26,7 @@ archs=('i686' 'x86_64') makedepends=('cmake' 'ftgl' 'subversion' 'boost>=1.50.0') up2date="Flasttar http://download.blender.org/source/"; source=(http://download.blender.org/source/$pkgname-$pkgver$pkgextraver.tar.gz) -<<<<<<< HEAD sha1sums=('a5cf7b4a47ebaed46cd77e3a826e82ceaf9d6a59') -======= -sha1sums=('f0de29ff6bc9e4be146ca2a47baec72adfaa8d83') ->>>>>>> 341de97fb84524accfccd92fe4920d9c75511903 _F_cmake_confopts="-DCMAKE_INSTALL_PREFIX=$Fprefix \ -DCMAKE_BUILD_TYPE:STRING=Release \ -DWITH_INSTALL_PORTABLE:BOOL=OFF \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
