]> asedeno.scripts.mit.edu Git - PuTTY.git/commit
projects / PuTTY.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit3ad0c89feca43af8c4e8ddb913bc232ad4fb5521
treea20471b0f8feccc815b41290a7a61f5991430918tree | snapshot
parentcfbe604d068ea8761eeb5da0138e4bef50dd077fcommit | diff
parent51586b6f26e81673b85b1840411983865359c156commit | diff
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.
local copy of git://git.tartarus.org/simon/putty.git