diff options
author | Ingela Anderton Andin <[email protected]> | 2010-07-07 14:45:02 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2010-07-07 14:45:02 +0200 |
commit | 299e223038502d4b1a7faaea096ca6efc88b5d9e (patch) | |
tree | 4b3f5c91644e755a9a1ba4e8c581c0b1d9254efe /lib/ssl/vsn.mk | |
parent | c752a4ea65c744ac283cc277717f8defa15ae610 (diff) | |
parent | dc67a89b7eccc8df60063c7c56aa26f8b1ef30ad (diff) | |
download | otp-299e223038502d4b1a7faaea096ca6efc88b5d9e.tar.gz otp-299e223038502d4b1a7faaea096ca6efc88b5d9e.tar.bz2 otp-299e223038502d4b1a7faaea096ca6efc88b5d9e.zip |
Merge branch 'ia/ssl/dsa_client_cert/OTP-8721' into dev
Diffstat (limited to 'lib/ssl/vsn.mk')
-rw-r--r-- | lib/ssl/vsn.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index 74b1cf4c78..254ee8b986 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -17,12 +17,14 @@ # %CopyrightEnd% # -SSL_VSN = 4.0 +SSL_VSN = 4.0.1 -TICKETS = OTP-8587\ - OTP-8695 +TICKETS = OTP-8721 -#TICKETS = OTP-8679 \ +#TICKETS_4.0 = OTP-8587\ +# OTP-8695 + +#TICKETS_3.11.1 = OTP-8679 \ # OTP-7047 \ # OTP-7049 \ # OTP-8568 \ |