]> asedeno.scripts.mit.edu Git - PuTTY.git/commitdiff
projects / PuTTY.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7713d4 31ff9e0)
Merge branch 'pre-0.65'
authorSimon Tatham <anakin@pobox.com>
Mon, 22 Jun 2015 18:44:39 +0000 (19:44 +0100)
committerSimon Tatham <anakin@pobox.com>
Mon, 22 Jun 2015 18:44:39 +0000 (19:44 +0100)
1  2 
ssh.c patch | diff1 | diff2 | blob | history

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