]> 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: 9ae65c8 db33a12)
Merge remote-tracking branch 'ms/ipsec-ios' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 20 May 2021 09:25:05 +0000 (09:25 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 20 May 2021 09:25:05 +0000 (09:25 +0000)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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