Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=129bda29a81170df0ef3f3e322d30c2990463d0b

commit 129bda29a81170df0ef3f3e322d30c2990463d0b
Merge: 781c51e 59bcbb0
Author: Baste <[email protected]>
Date:   Tue Feb 25 11:20:34 2014 +0100

Merge ../current

Conflicts:
source/gnome/gnome-shell/FrugalBuild
source/gnome/grilo/FrugalBuild
source/gnome/mutter/FrugalBuild

diff --cc source/gnome/gnome-shell/FrugalBuild
index 8ef0258,4a921bd..f25886b
--- a/source/gnome/gnome-shell/FrugalBuild
+++ b/source/gnome/gnome-shell/FrugalBuild
@@@ -55,8 -55,9 +55,9 @@@ Finclude gnome gnome-scriptle

#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/xulrunner/
#source=($source enable_shutdown.diff revert_utf8hack.diff fw_theme.diff)
-source=($source fwtweak.patch)
-sha1sums=('45f1b5ab213a8f5ebdd2b713e942accff4e66ad5' \
-          '0dc0e0a362f77471da61f8f0e8d719187c3572bf')
++
+#source=($source fwtweak.patch)
+sha1sums=('682e470c22994144a03b21464e6bd05a25cd9c80')

if [ "$_F_gnome_git" != "n" ]; then
unset sha1sums
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to