]> asedeno.scripts.mit.edu Git - PuTTY.git/commitdiff
projects / PuTTY.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 307aacc 95501a1)
Merge branch 'pre-0.65'
authorBen Harris <bjh21@bjh21.me.uk>
Thu, 25 Jun 2015 22:38:41 +0000 (23:38 +0100)
committerBen Harris <bjh21@bjh21.me.uk>
Thu, 25 Jun 2015 22:38:41 +0000 (23:38 +0100)
1  2 
psftp.c patch | diff1 | diff2 | blob | history

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