aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-03-17 12:25:59 +0100
committerMicael Karlberg <[email protected]>2011-03-17 12:25:59 +0100
commit30779c7f9e9c2e961548df333df842c7aa39b297 (patch)
treeba6b00d65f5d69d1a81cc7bbbf2e8e66a35e8b6a /lib/crypto
parent61c6577254568abd92c2d8d00c948cf230e602ca (diff)
parentf861b4fdb3fd39e35f2951c53a73b30a98c7f973 (diff)
downloadotp-30779c7f9e9c2e961548df333df842c7aa39b297.tar.gz
otp-30779c7f9e9c2e961548df333df842c7aa39b297.tar.bz2
otp-30779c7f9e9c2e961548df333df842c7aa39b297.zip
Merge branch 'dev' into bmk/inets/httpd/mod_sec_prop_docs_data_file/OTP-9131
Diffstat (limited to 'lib/crypto')
-rw-r--r--lib/crypto/doc/src/notes.xml15
-rw-r--r--lib/crypto/vsn.mk2
2 files changed, 16 insertions, 1 deletions
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index 54dd0cb01f..5e9bda3920 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -30,6 +30,21 @@
</header>
<p>This document describes the changes made to the Crypto application.</p>
+<section><title>Crypto 2.0.2.1</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Misc. Updates.</p>
+ <p>
+ Own Id: OTP-9132</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Crypto 2.0.2</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index 4b35c7c0b4..e2d6fd0b37 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 2.0.2
+CRYPTO_VSN = 2.0.2.1