]> 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: 13924a8 afbcc45)
Merge branch 'x-server' into qt-framework
authorSchantl Stefan <Stevee@ipfire.org>
Sun, 22 Aug 2010 15:45:22 +0000 (17:45 +0200)
committerSchantl Stefan <Stevee@ipfire.org>
Sun, 22 Aug 2010 15:45:22 +0000 (17:45 +0200)

Trivial merge
IPFire 3.x development tree