]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
projects / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eabc5bf 18213b4)
Merge remote-tracking branch 'stevee/xorg-x11-server'
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 8 Dec 2012 20:34:24 +0000 (21:34 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 8 Dec 2012 20:34:24 +0000 (21:34 +0100)

Trivial merge
IPFire 3.x development tree