]> asedeno.scripts.mit.edu Git - PuTTY.git/commit
projects / PuTTY.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 323c3c7 3a43bec)
Initial 'merge -s ours' from 0.66 release branch.
authorSimon Tatham <anakin@pobox.com>
Sat, 7 Nov 2015 09:14:42 +0000 (09:14 +0000)
committerSimon Tatham <anakin@pobox.com>
Sat, 7 Nov 2015 09:14:42 +0000 (09:14 +0000)
commit009ab4a20cfd685ff20b8f922068ffa6900b92c7
treef6a662a6b19cae685bd58db90edf5d332b6a99f5tree | snapshot
parent323c3c70c98072213b9aff1d04bc91e96632d260commit | diff
parent3a43bec44c870b6c9a0fc1a3aa8207aeb4fd59ebcommit | diff
Initial 'merge -s ours' from 0.66 release branch.

Everything up to here on the release branch is cherry-picks from
master anyway, and some of their cherry-picked forms conflict with the
current state of master due to further work, so here I'm just
recording an ancestry relation to indicate that there's nothing up to
here on 0.66 that master hasn't got.
local copy of git://git.tartarus.org/simon/putty.git