]> asedeno.scripts.mit.edu Git - PuTTY.git/commit - doc/config.but
projects / PuTTY.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitf7713d452d37e9b314af48bb295d418b185989b7
treeb8b23e9503ff96588107a9c204a3febd6fb7cae9tree | snapshot
parent6163710f043fb58fc80f6b45c14a92f7036bde75commit | diff
parent06946b4d4b3816fc2b26dd650a0b9d379fabdd85commit | diff
Inaugural merge from branch 'pre-0.65'.

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.
local copy of git://git.tartarus.org/simon/putty.git