simon-git: putty (master): Simon Tatham

[Commits to Tartarus CVS repository.]

TL;DR:
  f7713d4 Inaugural merge from branch 'pre-0.65'.
  0bd014e Merge branch 'pre-0.65'

Repository:     git://git.tartarus.org/simon/putty.git
On the web:     http://tartarus.org/~simon-git/gitweb/?p=putty.git
Branch updated: master
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2015-06-22 19:46:28

commit f7713d452d37e9b314af48bb295d418b185989b7
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=f7713d452d37e9b314af48bb295d418b185989b7;hp=6163710f043fb58fc80f6b45c14a92f7036bde75
Merge: 6163710 06946b4
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon Jun 22 19:43:22 2015 +0100

    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.

commit 0bd014e456a0e5f755c45a8a5a420d6fad85c1d8
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=0bd014e456a0e5f755c45a8a5a420d6fad85c1d8;hp=f7713d452d37e9b314af48bb295d418b185989b7
Merge: f7713d4 31ff9e0
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon Jun 22 19:44:39 2015 +0100

    Merge branch 'pre-0.65'