]> 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: a456f23 8aa49c1)
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 12 Dec 2008 15:20:12 +0000 (16:20 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 12 Dec 2008 15:20:12 +0000 (16:20 +0100)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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