]> 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 | combined (merge: dac7956 46c25c1)
Merge remote-tracking branch 'stevee/pixman'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 19 May 2012 20:50:05 +0000 (22:50 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 19 May 2012 20:50:05 +0000 (22:50 +0200)

Trivial merge
Alex's tree of IPFire 3.x