]> 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: 8d35adb ad92a4b)
Merge branch 'ccache-update' into glibc-update2
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 6 Aug 2012 20:06:36 +0000 (22:06 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 6 Aug 2012 20:06:36 +0000 (22:06 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history
tools/make-functions patch | diff1 | diff2 | blob | history

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