Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=bb5b2554648b988906cd77fb9ae7bee80c19baec
commit bb5b2554648b988906cd77fb9ae7bee80c19baec Merge: a4e8a4e bc0805e Author: bouleetbil <bouleet...@frogdev.info> Date: Thu Dec 1 14:38:31 2011 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/x11-extra/nvidia/FrugalBuild _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git