Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting5.git;a=commitdiff;h=04ad06333cc4afb8b04c25b9b01bb9857943f42f
commit 04ad06333cc4afb8b04c25b9b01bb9857943f42f Merge: 240dd82 4e2f84c Author: James Buren <[email protected]> Date: Thu Aug 23 23:56:30 2012 -0500 Merge branch 'master' of ../current Conflicts: source/xmultimedia-extra/enna/FrugalBuild _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
