]> asedeno.scripts.mit.edu Git - PuTTY.git/commitdiff
projects / PuTTY.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 71d802b 087adb1)
Merge from trunk again (because I want the helpful diagnostic code
authorSimon Tatham <anakin@pobox.com>
Sat, 22 Mar 2008 12:02:55 +0000 (12:02 +0000)
committerSimon Tatham <anakin@pobox.com>
Sat, 22 Mar 2008 12:02:55 +0000 (12:02 +0000)
in r7934 on this branch). Now up to date as of r7934.

[originally from svn r7935]
[r7934 == 087adb167e9e25a09839ca802707c11565468e11]


Trivial merge
local copy of git://git.tartarus.org/simon/putty.git