From: Simon Tatham Date: Mon, 22 Jun 2015 18:43:22 +0000 (+0100) Subject: Inaugural merge from branch 'pre-0.65'. X-Git-Tag: 0.68~513 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f7713d452d37e9b314af48bb295d418b185989b7;hp=-c;p=PuTTY.git 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. --- f7713d452d37e9b314af48bb295d418b185989b7