]> 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: f135d9d 7bfd2a0)
Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Dec 2008 23:37:04 +0000 (00:37 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 27 Dec 2008 23:37:04 +0000 (00:37 +0100)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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