summaryrefslogtreecommitdiff
path: root/lib/public_key
diff options
context:
space:
mode:
authorErlang/OTP <otp@erlang.org>2016-06-02 10:55:26 +0200
committerErlang/OTP <otp@erlang.org>2016-06-02 10:55:26 +0200
commite020f75c10410a6943cd055bfa072a2641eab7da (patch)
tree56f9a4af41b86bf1530bada0a930bd79f8fb952d /lib/public_key
parentfe1c9b60822ba9818e06caf1b53f079bb1575086 (diff)
downloaderlang-e020f75c10410a6943cd055bfa072a2641eab7da.tar.gz
Prepare release
Diffstat (limited to 'lib/public_key')
-rw-r--r--lib/public_key/doc/src/notes.xml15
-rw-r--r--lib/public_key/vsn.mk2
2 files changed, 16 insertions, 1 deletions
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index 49b2ba0326..ee37d38a56 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -35,6 +35,21 @@
<file>notes.xml</file>
</header>
+<section><title>Public_Key 1.2</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Handle PEM encoded EC public keys</p>
+ <p>
+ Own Id: OTP-13408</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Public_Key 1.1.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index f801f55073..84f6a659b5 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 1.1.1
+PUBLIC_KEY_VSN = 1.2