]> asedeno.scripts.mit.edu Git - PuTTY.git/commitdiff
projects / PuTTY.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6163710 06946b4)
Inaugural merge from branch 'pre-0.65'.
authorSimon Tatham <anakin@pobox.com>
Mon, 22 Jun 2015 18:43:22 +0000 (19:43 +0100)
committerSimon Tatham <anakin@pobox.com>
Mon, 22 Jun 2015 18:43:22 +0000 (19:43 +0100)
This is a null merge (done with '-s ours'), not changing the code on
master at all: it just adds an ancestor relationship so that any fresh
commits on pre-0.65 can be cleanly merged to here in the obvious way.


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