aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2016-02-26 12:19:55 +0100
committerHans Nilsson <[email protected]>2016-02-26 12:19:55 +0100
commit0b58c464447024770b601b38cf9e35ceb2e49883 (patch)
treed87e39e42b8da15f545c64ae532d561389474dfd
parent5154dc8ff3d529e33e06b6fbf0d3906d06492353 (diff)
parent1c7a593c8220668c08da8782a905f4d599e184db (diff)
downloadotp-0b58c464447024770b601b38cf9e35ceb2e49883.tar.gz
otp-0b58c464447024770b601b38cf9e35ceb2e49883.tar.bz2
otp-0b58c464447024770b601b38cf9e35ceb2e49883.zip
Merge branch 'hans/ssh/prepare_release' into maint
-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 55d12abffe..41b42d454b 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
#-*-makefile-*- ; force emacs to enter makefile-mode
-SSH_VSN = 4.2.1
+SSH_VSN = 4.2.2
APP_VSN = "ssh-$(SSH_VSN)"