aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/vsn.mk
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2010-10-25 12:20:40 +0200
committerErlang/OTP <[email protected]>2010-10-25 12:20:40 +0200
commit759cac44271f4e442ab557cab89dfa390c86f078 (patch)
treee26c670b0c288961e5164df80415f11b7c4ca39f /lib/ssh/vsn.mk
parent644d0c54643eda5216a1fa0ff012d1ebcae5ce8e (diff)
parent00d27caa001444e65e9dd3a7d3bc65cfde4b5866 (diff)
downloadotp-759cac44271f4e442ab557cab89dfa390c86f078.tar.gz
otp-759cac44271f4e442ab557cab89dfa390c86f078.tar.bz2
otp-759cac44271f4e442ab557cab89dfa390c86f078.zip
Merge branch 'nick/ssh/missing_catch/OTP-8908' into maint-r13
* nick/ssh/missing_catch/OTP-8908: The fix regarding OTP-8863 was not included in the previous version as stated
Diffstat (limited to 'lib/ssh/vsn.mk')
-rw-r--r--lib/ssh/vsn.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index cf90e3b11e..a6bc521003 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,9 +1,11 @@
#-*-makefile-*- ; force emacs to enter makefile-mode
-SSH_VSN = 1.1.12
+SSH_VSN = 1.1.13
APP_VSN = "ssh-$(SSH_VSN)"
-TICKETS = OTP-8807 \
+TICKETS = OTP-8908
+
+TICKETS_1.1.12 = OTP-8807 \
OTP-8881
TICKETS_1.1.11 = OTP-8735