Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=devil505temp.git;a=commitdiff;h=d15596ce3daa46ade020874e4ec509a44e36e93e
commit d15596ce3daa46ade020874e4ec509a44e36e93e Merge: 4f0ad95 8b58a3f Author: Devil505 <devil505li...@gmail.com> Date: Sun Jan 29 19:41:35 2012 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/apps-extra/tyrs/FrugalBuild source/devel-extra/cython/FrugalBuild source/devel-extra/lazr.restful/FrugalBuild source/devel-extra/perl-json-xs/FrugalBuild source/devel-extra/perl-poe/FrugalBuild source/games-extra/angband/FrugalBuild source/gnome-extra/gpodder/FrugalBuild source/gnome-extra/ubuntuone-client/FrugalBuild source/lib-extra/launchpadlib/FrugalBuild source/xapps-extra/minitube/FrugalBuild source/xapps-extra/xcfa/FrugalBuild source/xfce4-extra/xfce4-mailwatch-plugin/FrugalBuild source/xfce4/xfce4-notifyd/FrugalBuild source/xlib-extra/yad/FrugalBuild source/xmultimedia-extra/picard/FrugalBuild source/xmultimedia/ffmpeg/FrugalBuild _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
