]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b7913e e967320)
Merge remote-tracking branch 'origin/next' into glibc-update2
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 22 Aug 2012 10:23:11 +0000 (12:23 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 22 Aug 2012 10:23:11 +0000 (12:23 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

diff --cc make.sh
Simple merge
IPFire 2.x development tree