]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
projects / people / pmueller / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fdc0944 3b1c776)
Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 1 Jun 2017 13:43:48 +0000 (15:43 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 1 Jun 2017 13:43:48 +0000 (15:43 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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