diff options
author | Ingela Anderton Andin <[email protected]> | 2014-05-27 16:55:33 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2014-05-27 16:55:33 +0200 |
commit | 95ffa9b741631752633b3c97dfcd1ce620574e94 (patch) | |
tree | 922e18f279ded1d25995e05e94a52c9b73f62799 /lib/ssh/vsn.mk | |
parent | 339b6416664c7dc64d72c21653138137e8d1018f (diff) | |
parent | deacab96d83ad6432afbcba54cf2e372395008e5 (diff) | |
download | otp-95ffa9b741631752633b3c97dfcd1ce620574e94.tar.gz otp-95ffa9b741631752633b3c97dfcd1ce620574e94.tar.bz2 otp-95ffa9b741631752633b3c97dfcd1ce620574e94.zip |
Merge branch 'maint-17' into maint
Conflicts:
OTP_VERSION
lib/ssh/test/ssh_basic_SUITE.erl
lib/ssh/vsn.mk
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 c8cac3e852..40ed27d8f5 100644 --- a/lib/ssh/vsn.mk +++ b/lib/ssh/vsn.mk @@ -1,5 +1,5 @@ #-*-makefile-*- ; force emacs to enter makefile-mode -SSH_VSN = 3.1 +SSH_VSN = 3.0.2 APP_VSN = "ssh-$(SSH_VSN)" |