]> asedeno.scripts.mit.edu Git - PuTTY.git/commit
projects / PuTTY.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7705fc4 23fbc4f)
Merge the 0.68 release branchlet to master.
authorSimon Tatham <anakin@pobox.com>
Mon, 20 Feb 2017 20:52:41 +0000 (20:52 +0000)
committerSimon Tatham <anakin@pobox.com>
Mon, 20 Feb 2017 20:52:41 +0000 (20:52 +0000)
commit359b5c8eb45ff56c62032cf147fcdb3723d54324
tree6edf848538e4ced0cc0eda942f2947c25705b885tree | snapshot
parent7705fc4470b76ec7979dc00e5c97efd720d5e335commit | diff
parent23fbc4f56b04ca5d387c16720caa05ddf2d63e2fcommit | diff
Merge the 0.68 release branchlet to master.

Conflicts in the FAQ are fixed by incorporating Jacob's rewritten
post-0.68 version. (But owing to considerable git confusion I haven't
managed to get his name on to this commit anywhere.)
doc/faq.but diff1 | diff2 | blob | history
local copy of git://git.tartarus.org/simon/putty.git