]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/commitdiff
projects / people / amarx / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 1477f6d f0e1ad5)
Merge remote-tracking branch 'stevee/fontforge'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 19 May 2012 20:51:15 +0000 (22:51 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 19 May 2012 20:51:15 +0000 (22:51 +0200)

Trivial merge
Alex's tree of IPFire 3.x