diff options
author | Erlang/OTP <[email protected]> | 2014-10-13 09:38:50 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2014-10-13 09:38:50 +0200 |
commit | c5d8b91af8011b82619f6ccca53a5a933ab91f7e (patch) | |
tree | 6537af23600d4339d1670f5b7524a75322c56f31 /make/otp.mk.in | |
parent | aebab2324285d3751c1ce73ad803be487ceb3a16 (diff) | |
parent | 61f8ef381882eb0953b1e087d53894b88b356715 (diff) | |
download | otp-c5d8b91af8011b82619f6ccca53a5a933ab91f7e.tar.gz otp-c5d8b91af8011b82619f6ccca53a5a933ab91f7e.tar.bz2 otp-c5d8b91af8011b82619f6ccca53a5a933ab91f7e.zip |
Merge branch 'ia/patch-17/ssh/user-interaction/OTP-11329/sftp-version/OTP-12227' into maint-17
* ia/patch-17/ssh/user-interaction/OTP-11329/sftp-version/OTP-12227:
ssh: Prepare for release
ssh: Add option sftp_vsn
ssh: Fix option user_interaction to work as expected
Diffstat (limited to 'make/otp.mk.in')
0 files changed, 0 insertions, 0 deletions