Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=devil505temp.git;a=commitdiff;h=4f0ad958da92aec0150b0b69748e127362c501ed

commit 4f0ad958da92aec0150b0b69748e127362c501ed
Merge: 860bc30 0e82b8f
Author: Devil505 <devil505li...@gmail.com>
Date:   Sun Aug 14 18:16:07 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

Conflicts:
source/network-extra/zd1211-firmware/FrugalBuild
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to