aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-10-02 08:49:23 +0200
committerHans Nilsson <[email protected]>2015-10-02 08:49:23 +0200
commit212e71b7f19d9f024eb11b371d3ce1ece26a2c42 (patch)
treeecb75e3e196d05344f85b0c35e8e37cf52b57298
parent0b082b4943bdf5bb9bbefdb956df767fde1bd001 (diff)
parentbb63fc9bca7233d0f9e8b9abe96c66eac5bdc933 (diff)
downloadotp-212e71b7f19d9f024eb11b371d3ce1ece26a2c42.tar.gz
otp-212e71b7f19d9f024eb11b371d3ce1ece26a2c42.tar.bz2
otp-212e71b7f19d9f024eb11b371d3ce1ece26a2c42.zip
Merge branch 'hans/ssh/update_vsn.mk' into maint
* hans/ssh/update_vsn.mk: ssh: 4.1->4.2
-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)"