simon-git: putty (master): Simon Tatham

Sat Mar 5 08:43:18 GMT 2016

TL;DR:
  3ad0c89 Inaugural merge from branch 'pre-0.67'.
  984fe3d Merge branch 'pre-0.67'

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:           2016-03-05 08:43:18

commit 3ad0c89feca43af8c4e8ddb913bc232ad4fb5521
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=3ad0c89feca43af8c4e8ddb913bc232ad4fb5521;hp=cfbe604d068ea8761eeb5da0138e4bef50dd077f
Merge: cfbe604 51586b6
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon Feb 29 19:59:37 2016 +0000

    Inaugural merge from branch 'pre-0.67'.
    
    This is a 'merge -s ours', making no change to master but just
    recording an ancestry relationship to make further merges from the
    release branch easy.

commit 984fe3dde809681f91d72152a4f96e91d79a2855
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=984fe3dde809681f91d72152a4f96e91d79a2855;hp=3ad0c89feca43af8c4e8ddb913bc232ad4fb5521
Merge: 3ad0c89 830b7f8
Author: Simon Tatham <anakin at pobox.com>
Date:   Mon Feb 29 19:59:59 2016 +0000

    Merge branch 'pre-0.67'