Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=68dc1b661b55093fd1c413e315e6ce750ee3857a
commit 68dc1b661b55093fd1c413e315e6ce750ee3857a Author: Baste <[email protected]> Date: Mon Jul 16 12:22:11 2012 +0200 * Fix confict diff --git a/source/xlib/gtk+3/FrugalBuild b/source/xlib/gtk+3/FrugalBuild index e975ea0..428853e 100644 --- a/source/xlib/gtk+3/FrugalBuild +++ b/source/xlib/gtk+3/FrugalBuild @@ -4,11 +4,7 @@ pkgname=gtk+3 _F_gnome_name=gtk+ -<<<<<<< HEAD pkgver=3.5.6 -======= -pkgver=3.4.4 ->>>>>>> 782d8965929409f08616a5b570c59db5a5ecace2 pkgrel=1 pkgdesc="The GTK+ Toolkit (3.x series)" depends=('libxext' 'libxfixes' 'cairo' 'libgcc' 'libjpeg' 'libtiff' 'libcups' \ @@ -26,11 +22,7 @@ Finclude gnome gnome-scriptlet url="http://www.gtk.org/"; _F_cd_path="gtk+-$pkgver" source=($source im-cedilla.conf) -<<<<<<< HEAD sha1sums=('2e9e8eb166ecca5048e1468f43d761fbe0470b33' \ -======= -sha1sums=('f260cc9b1750afb99da144c8abdf1198c0386d5f' \ ->>>>>>> 782d8965929409f08616a5b570c59db5a5ecace2 'f8a64241bcc873c1f1110e16306e48577a41852b') if [ "$_F_gnome_git" != "n" ]; then _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
