Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=bouletmp.git;a=commitdiff;h=e2abdb45949a090cb4a29781e9fdf6d971f71a96
commit e2abdb45949a090cb4a29781e9fdf6d971f71a96 Merge: 5f43b42 a0e2373 Author: bouleetbil <bouleet...@frogdev.info> Date: Thu Aug 4 11:26:04 2011 +0200 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/gnome-extra/gnote/FrugalBuild _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
