]> 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: d0bfb0c 866b058)
Merge branch 'master' of git://git.ipfire.org/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 20 Jan 2009 11:42:43 +0000 (12:42 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 20 Jan 2009 11:42:43 +0000 (12:42 +0100)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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