]> 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: 8c4f3d1 2f58be7)
Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 27 Jul 2011 16:41:31 +0000 (18:41 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 27 Jul 2011 16:41:31 +0000 (18:41 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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