aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/vsn.mk
diff options
context:
space:
mode:
authorNiclas Eklund <[email protected]>2010-12-10 17:00:02 +0100
committerNiclas Eklund <[email protected]>2010-12-10 17:00:02 +0100
commit8bd0325c850ad70e514f680a2dd7020144773665 (patch)
tree9d8ad2b52391cb54db7fef5c84d0b519c1d48c34 /lib/ssh/vsn.mk
parent3cf40cefd44ab6383bd16319c7c6941fd0d0f13c (diff)
parentcaa311d4a2b5fb229d9369c7667b062b34945b36 (diff)
downloadotp-8bd0325c850ad70e514f680a2dd7020144773665.tar.gz
otp-8bd0325c850ad70e514f680a2dd7020144773665.tar.bz2
otp-8bd0325c850ad70e514f680a2dd7020144773665.zip
Merge branch 'maint-r13' of super:otp into nick/orber/recursive_types/OTP-8868
Diffstat (limited to 'lib/ssh/vsn.mk')
-rw-r--r--lib/ssh/vsn.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 8e31851a8e..a053318120 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,9 +1,14 @@
#-*-makefile-*- ; force emacs to enter makefile-mode
-SSH_VSN = 1.1.11
+SSH_VSN = 1.1.12
APP_VSN = "ssh-$(SSH_VSN)"
-TICKETS = OTP-8735
+TICKETS = OTP-8908
+
+TICKETS_1.1.12 = OTP-8807 \
+ OTP-8881
+
+TICKETS_1.1.11 = OTP-8735
TICKETS_1.1.10 = OTP-8714