aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2016-05-12 12:04:14 +0200
committerErlang/OTP <[email protected]>2016-05-12 12:04:14 +0200
commit663e847459686604ea051f036a0e4caff18cea6f (patch)
tree978aea941c88a814947a664cebd1f93991e544f3 /lib/public_key
parentf68a3780fbcc836c7036b55db5ee1d0447213c8f (diff)
downloadotp-663e847459686604ea051f036a0e4caff18cea6f.tar.gz
otp-663e847459686604ea051f036a0e4caff18cea6f.tar.bz2
otp-663e847459686604ea051f036a0e4caff18cea6f.zip
Revert "Prepare release"
This reverts commit bd64ad8e15d66e48b36dbe3584315dd5cfc8b59a.
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, 1 insertions, 16 deletions
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index ee37d38a56..49b2ba0326 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -35,21 +35,6 @@
<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 84f6a659b5..f801f55073 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 1.2
+PUBLIC_KEY_VSN = 1.1.1