aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/vsn.mk
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2010-12-20 18:11:43 +0100
committerIngela Anderton Andin <[email protected]>2010-12-20 18:11:43 +0100
commit149a68f24671702ac0dfd3fcea9e35f18b8d9b53 (patch)
tree0eb526749ac750ae6a0ea197693af1d279f74b71 /lib/ssl/vsn.mk
parent8a1ec022a6395ce6c228c6776dc12bff4f3967cf (diff)
parentbb4d67a8f13a5a626e587836cda65c66ae17af0f (diff)
downloadotp-149a68f24671702ac0dfd3fcea9e35f18b8d9b53.tar.gz
otp-149a68f24671702ac0dfd3fcea9e35f18b8d9b53.tar.bz2
otp-149a68f24671702ac0dfd3fcea9e35f18b8d9b53.zip
Merge commit 'build/maint-r14/2010-12-20_15.15' into maint-r14
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