]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commitdiff
projects / people / teissler / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: adc8e4b 2f7e68c)
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 10 May 2011 17:20:43 +0000 (19:20 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 10 May 2011 17:20:43 +0000 (19:20 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

diff --cc make.sh
Simple merge
Timo's tree of IPFire 2.x