Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=gnometesting.git;a=commitdiff;h=9ef1eaba68b44539c65c13caa8d2ddaffc30b1a8
commit 9ef1eaba68b44539c65c13caa8d2ddaffc30b1a8 Merge: b9b2e8b 5b43997 Author: bouleetbil <bouleet...@frogdev.info> Date: Fri Nov 25 09:42:17 2011 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/gnome-extra/gthumb/FrugalBuild source/gnome/at-spi2-core/FrugalBuild _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git