]> git.ipfire.org Git - people/stevee/ipfire-2.x.git/commitdiff
projects / people / stevee / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6bc2225 40607f8)
Merge branch 'core104' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 17 Aug 2016 17:51:01 +0000 (19:51 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 17 Aug 2016 17:51:01 +0000 (19:51 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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