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

commit bec0f3550330db59ffa296ed9be09f1e2344216b
Merge: 8f9d855 7379f53
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Mon Aug 22 22:10:55 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

Conflicts:
source/gnome/gnome-session/FrugalBuild

diff --cc source/gnome/gnome-session/FrugalBuild
index 319d3ad,9eaf6ec..0e60bef
--- a/source/gnome/gnome-session/FrugalBuild
+++ b/source/gnome/gnome-session/FrugalBuild
@@@ -19,10 -19,10 +19,11 @@@ _F_gnome_glib="y
_F_gnome_iconcache="y"
_F_gnome_desktop="y"
Finclude gnome gnome-scriptlet
+source=($source check_XGetWindowProperty.diff)
Fconfopts="$Fconfopts --with-gtk=3.0"
- sha1sums=('f13b9d7fb86d15a45c179b8ebb4f11cccd5090a4' \
-           '32a9743c3797a29355b605dcf7a78f73190c8249')
+ source=($source check_XGetWindowProperty.diff)
-sha1sums=('5559a71ef3134f3aaa48b7f06e2123714f71756f' \
-          '32a9743c3797a29355b605dcf7a78f73190c8249')
++sha1sums=('f13b9d7fb86d15a45c179b8ebb4f11cccd5090a4' \
++      '32a9743c3797a29355b605dcf7a78f73190c8249')

build() {
Fcd
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to