diff options
author | Raimo Niskanen <[email protected]> | 2018-03-22 10:06:17 +0100 |
---|---|---|
committer | Raimo Niskanen <[email protected]> | 2018-03-22 10:06:17 +0100 |
commit | 0c151c6939a83f9a26a45d24fd504fc4fb2f3f01 (patch) | |
tree | 0d3c171138d07cbd0eaccbd895dd8a37efb5002d /lib/ssh/vsn.mk | |
parent | a59429dcf6f69054e5e82783f7adf8a03c11fcc7 (diff) | |
parent | c5ee502e6031986983d3596745cad7fd547fd9c2 (diff) | |
download | otp-0c151c6939a83f9a26a45d24fd504fc4fb2f3f01.tar.gz otp-0c151c6939a83f9a26a45d24fd504fc4fb2f3f01.tar.bz2 otp-0c151c6939a83f9a26a45d24fd504fc4fb2f3f01.zip |
Merge branch 'maint'
* maint:
Updated OTP version
Update release notes
Update version numbers
ssh: Fix bad spec for double_algs() in ssh.hrl
Test event insert from init
Fix init to allow all actions
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/ssh/vsn.mk')
-rw-r--r-- | lib/ssh/vsn.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk index 99c5cbd346..d5eed0b087 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,4 +1,4 @@ #-*-makefile-*- ; force emacs to enter makefile-mode -SSH_VSN = 4.6.6 +SSH_VSN = 4.6.7 APP_VSN = "ssh-$(SSH_VSN)" |