]> git.ipfire.org Git - people/arne_f/ipfire-2.x.git/commitdiff
projects / people / arne_f / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 031becc f0aa99f)
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 10 Jul 2015 16:58:11 +0000 (18:58 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 10 Jul 2015 16:58:11 +0000 (18:58 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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