]> 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: 53094ad feadf62)
Merge remote-tracking branch 'origin/master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 31 May 2017 20:26:45 +0000 (21:26 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 31 May 2017 20:26:45 +0000 (21:26 +0100)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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