Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=414416f566b0e1055695a9a326ca3f442fedfc02
commit 414416f566b0e1055695a9a326ca3f442fedfc02 Merge: 046094d 7ee5727 Author: bouleetbil <[email protected]> Date: Wed Nov 30 21:03:03 2011 +0100 Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current Conflicts: source/x11-extra/nvidia/FrugalBuild source/x11/xf86-input-synaptics/FrugalBuild _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
