]> asedeno.scripts.mit.edu Git - PuTTY.git/commitdiff
projects / PuTTY.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cfbe604 51586b6)
Inaugural merge from branch 'pre-0.67'.
authorSimon Tatham <anakin@pobox.com>
Mon, 29 Feb 2016 19:59:37 +0000 (19:59 +0000)
committerSimon Tatham <anakin@pobox.com>
Mon, 29 Feb 2016 19:59:37 +0000 (19:59 +0000)
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.


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