~mdw / secnet / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb80704 b6aae8b)
Merge remote-tracking branch 'mdw/mdw/powm-sec'
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 25 Apr 2017 12:05:53 +0000 (13:05 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Tue, 25 Apr 2017 12:05:53 +0000 (13:05 +0100)
1  2 
Makefile.in patch | diff1 | diff2 | blob | history

diff --cc Makefile.in
Simple merge
Secnet virtual private network: clone of http://www.chiark.greenend.org.uk/ucgi/~ian/git/secnet.git/