diff options
author | Henrik Nord <[email protected]> | 2016-01-11 15:54:21 +0100 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2016-01-11 15:54:21 +0100 |
commit | f1447b51b578e6b5e42819ef8af057da2d0bc70e (patch) | |
tree | 8cff51ab7f1403ce9a519c4626b2f0c10d3a1b44 /lib/ssh/vsn.mk | |
parent | 49f621565fb022a17d572e9a59dd3c1d43c08618 (diff) | |
parent | 12dffc7f0c85aa4662b97cba4af2c9ae2ba74083 (diff) | |
download | otp-f1447b51b578e6b5e42819ef8af057da2d0bc70e.tar.gz otp-f1447b51b578e6b5e42819ef8af057da2d0bc70e.tar.bz2 otp-f1447b51b578e6b5e42819ef8af057da2d0bc70e.zip |
Merge branch 'maint'
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 25b19133b1..55d12abffe 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 +SSH_VSN = 4.2.1 APP_VSN = "ssh-$(SSH_VSN)" |