]> asedeno.scripts.mit.edu Git - PuTTY.git/commitdiff
projects / PuTTY.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ab1433 f662ff7)
Merge reconfig fixes from branch 'pre-0.64'.
authorJacob Nevins <jacobn@chiark.greenend.org.uk>
Sun, 9 Nov 2014 00:12:51 +0000 (00:12 +0000)
committerJacob Nevins <jacobn@chiark.greenend.org.uk>
Sun, 9 Nov 2014 00:12:55 +0000 (00:12 +0000)
1  2 
config.c patch | diff1 | diff2 | blob | history
ssh.c patch | diff1 | diff2 | blob | history

diff --cc config.c
Simple merge
diff --cc ssh.c
Simple merge
local copy of git://git.tartarus.org/simon/putty.git