]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
projects / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e78d9e4 3af3a6c)
Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 4 May 2016 07:14:29 +0000 (09:14 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 4 May 2016 07:14:29 +0000 (09:14 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

diff --cc make.sh
Simple merge
IPFire 2.x development tree