]> 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: 54ec5af 754c4b4)
Merge commit 'stevee/qt-framework' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 22 Aug 2010 17:13:20 +0000 (19:13 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 22 Aug 2010 17:13:20 +0000 (19:13 +0200)

Trivial merge
IPFire 3.x development tree