]> 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: 3db0947 a8a52f3)
Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-3.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 31 May 2009 11:11:52 +0000 (13:11 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 31 May 2009 11:11:52 +0000 (13:11 +0200)
1  2 
lfs/Config patch | diff1 | diff2 | blob | history
make.sh patch | diff1 | diff2 | blob | history

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