nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-02 12:02:47 -05:00
Code Issues Projects Releases Wiki Activity

Merge tag '0.66'

Browse Source 
This brings in the rest of the 0.66 branch, including some changes new
on master.

Conflicts:
        doc/plink.but
        sshrsa.c

(The conflicts were both trivial: in one, the addition of an extra
parameter to rsa2_newkey on master happened on the line next to 0.66's
addition of a check for NULL return value, and in the other, I'd got
the version number in the plink -h transcript messed up on master.)
This commit is contained in:
Simon Tatham
2015-11-07 09:54:05 +00:00
parent 009ab4a20c 07af4ed100
commit 8fdeb3a95c
11 changed files with 86 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/plink.but
View File

@ -41,7 +41,7 @@ use Plink:
\c Z:\sysosd>plink
\c Plink: command-line connection utility
\c Release 0.XX
\c Release 0.66
\c Usage: plink [options] [user@]host [command]
\c ("host" can also be a PuTTY saved session name)
\c Options: