]> www.infradead.org Git - users/dwmw2/openconnect.git/commitdiff
projects / users / dwmw2 / openconnect.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69793ae f0a599e)
Merge branch 'globalprotect' of https://github.com/dlenski/openconnect gp
authorDavid Woodhouse <dwmw2@infradead.org>
Sun, 14 May 2017 07:17:51 +0000 (08:17 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Sun, 14 May 2017 07:17:51 +0000 (08:17 +0100)
1  2 
main.c patch | diff1 | diff2 | blob | history

diff --cc main.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.