aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/vsn.mk
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-04-15 12:08:38 +0200
committerMicael Karlberg <[email protected]>2011-04-15 12:08:38 +0200
commitf5cb2e252f789ed9fc99f638772b9292a2df7c44 (patch)
tree5accea367e85cbe63afa9927c1239ef995daa16c /lib/ssl/vsn.mk
parentbb6e729795ebf3dddfcfd7182384bda59e9f6a94 (diff)
parent23906a01725f4494b8816c242926d08aeca0ef67 (diff)
downloadotp-f5cb2e252f789ed9fc99f638772b9292a2df7c44.tar.gz
otp-f5cb2e252f789ed9fc99f638772b9292a2df7c44.tar.bz2
otp-f5cb2e252f789ed9fc99f638772b9292a2df7c44.zip
Merge branch 'dev' into bmk/snmp/snmp420_integration
Diffstat (limited to 'lib/ssl/vsn.mk')
-rw-r--r--lib/ssl/vsn.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 2f1edfa186..0e80e42637 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 4.1.4
+SSL_VSN = 4.1.5