]> git.ipfire.org Git - people/ms/ipfire-2.x.git/commitdiff
projects / people / ms / ipfire-2.x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6be2813 d2d7a46)
Merge remote-tracking branch 'ms/stunnel-addon'
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 30 Apr 2014 13:02:51 +0000 (15:02 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 30 Apr 2014 13:02:51 +0000 (15:02 +0200)
1  2 
make.sh patch | diff1 | diff2 | blob | history

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