]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46c2a9e 38b0ebb)
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 10 May 2011 12:33:34 +0000 (14:33 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 10 May 2011 12:33:34 +0000 (14:33 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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