]> git.ipfire.org Git - people/ms/ipfire-3.x.git/commitdiff
projects / people / ms / ipfire-3.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5932b37 5358d1e)
Merge branch 'new-packages' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 21 May 2010 18:45:15 +0000 (20:45 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 21 May 2010 18:45:15 +0000 (20:45 +0200)
Conflicts:
pkgs/toolchain/glibc/patches


Trivial merge
Michael's tree of IPFire 3.x.