Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=5813037c435de56d32b28b08d29dc2e75f66f220
commit 5813037c435de56d32b28b08d29dc2e75f66f220 Merge: ea1add5 bba67dd Author: bouleetbil <[email protected]> Date: Wed Oct 12 21:25:43 2011 +0200 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/gnome-extra/gnome-shell-extensions/FrugalBuild diff --cc source/gnome-extra/gnome-shell-extensions/FrugalBuild index 4520d48,e1fe48e..bee9a9b --- a/source/gnome-extra/gnome-shell-extensions/FrugalBuild +++ b/source/gnome-extra/gnome-shell-extensions/FrugalBuild @@@ -13,12 -13,10 +13,13 @@@ archs=('i686' 'x86_64' _F_gnome_git="n" _F_gnome_glib="y" Finclude gnome gnome-scriptlet gnome-shell-extensions - source=($source dock.patch) ++source=($source dock.patch) +sha1sums=('899f23d0aa0ccd65c8c569e4e9d63ffd54303bb9' \ + 'e56508e80791a762c2b82a5bf20d8347a1ed4b50') - source=($source dock.diff) + source=($source dock.diff dock.patch) sha1sums=('899f23d0aa0ccd65c8c569e4e9d63ffd54303bb9' \ - '8329fe51a8b340038e5a6634b0a9f444e7f10ca1') + '8329fe51a8b340038e5a6634b0a9f444e7f10ca1' \ + '58aed13fcaaddeb8fe81376ba16f0232d04ac6b3') if [ "$_F_gnome_git" != "n" ]; then unset sha1sums fi _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
