aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-10-02 08:49:53 +0200
committerHans Nilsson <[email protected]>2015-10-02 08:49:53 +0200
commit7fd7502faa968d668f20dbcfb821255363110c66 (patch)
tree2a154f0545f9378737ffcd56affdeb5913c470a6 /lib
parentd28b1c8db52e7fac568c85946b6f3a342e879148 (diff)
parent212e71b7f19d9f024eb11b371d3ce1ece26a2c42 (diff)
downloadotp-7fd7502faa968d668f20dbcfb821255363110c66.tar.gz
otp-7fd7502faa968d668f20dbcfb821255363110c66.tar.bz2
otp-7fd7502faa968d668f20dbcfb821255363110c66.zip
Merge branch 'maint'
* maint: ssh: 4.1->4.2
Diffstat (limited to 'lib')
-rw-r--r--lib/ssh/vsn.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index b305eedcdc..d828bccd29 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.1
+SSH_VSN = 4.2
APP_VSN = "ssh-$(SSH_VSN)"