]> 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: 9573c4e 5932b37)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into updates
authorSchantl Stefan <Stevee@ipfire.org>
Sat, 22 May 2010 21:23:15 +0000 (23:23 +0200)
committerSchantl Stefan <Stevee@ipfire.org>
Sat, 22 May 2010 21:23:15 +0000 (23:23 +0200)
Conflicts:
pkgs/toolchain/glibc/patches


Trivial merge
IPFire 3.x development tree