]> 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: b0b9e27 c2bebeb)
Merge remote-tracking branch 'origin/master' into kernel-4.14
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 14 Dec 2017 18:54:48 +0000 (19:54 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 14 Dec 2017 18:54:48 +0000 (19:54 +0100)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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