aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/vsn.mk
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2010-12-20 18:24:15 +0100
committerIngela Anderton Andin <[email protected]>2010-12-20 18:24:15 +0100
commitf026b83b15b144965ae2013eaeae320dd16b3c10 (patch)
tree07b12182918904f17fec91825a32658c5d58bca6 /lib/ssl/vsn.mk
parentefb4fe5f64e3470a4aa9626cc3d8a2e136183cae (diff)
parent149a68f24671702ac0dfd3fcea9e35f18b8d9b53 (diff)
downloadotp-f026b83b15b144965ae2013eaeae320dd16b3c10.tar.gz
otp-f026b83b15b144965ae2013eaeae320dd16b3c10.tar.bz2
otp-f026b83b15b144965ae2013eaeae320dd16b3c10.zip
Merge branch 'maint-r14' into dev
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 ee692adb3b..b1ae0db7e7 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1,2 +1,2 @@
-SSL_VSN = 4.1.1
+SSL_VSN = 4.1.2