]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 997736b 7af07de)
Merge branch 'glibc-update2' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x...
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 15 Aug 2012 16:54:12 +0000 (18:54 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 15 Aug 2012 16:54:12 +0000 (18:54 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

diff --cc make.sh
Simple merge
Peter's tree of IPFire 2.x