aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2011-09-21 15:40:32 +0200
committerIngela Anderton Andin <[email protected]>2011-09-21 15:40:32 +0200
commit4b300743a6035344ff3f8f74aee9fd218af8e953 (patch)
tree9a39aa1d0cddc6f33d016df8d2c14d9ea52c9681 /lib
parenta192733e4d2b4d74a1ce11bd75c9e59da8f41e0d (diff)
parent06b914798569d70e1ecd4769e95d9969fbce97da (diff)
downloadotp-4b300743a6035344ff3f8f74aee9fd218af8e953.tar.gz
otp-4b300743a6035344ff3f8f74aee9fd218af8e953.tar.bz2
otp-4b300743a6035344ff3f8f74aee9fd218af8e953.zip
Merge remote branch 'upstream/dev' into major
* upstream/dev: Prepare for release
Diffstat (limited to 'lib')
-rw-r--r--lib/public_key/src/public_key.appup.src12
-rw-r--r--lib/public_key/vsn.mk2
2 files changed, 13 insertions, 1 deletions
diff --git a/lib/public_key/src/public_key.appup.src b/lib/public_key/src/public_key.appup.src
index 4986801dad..18fae54d18 100644
--- a/lib/public_key/src/public_key.appup.src
+++ b/lib/public_key/src/public_key.appup.src
@@ -1,6 +1,12 @@
%% -*- erlang -*-
{"%VSN%",
[
+ {"0.12",
+ [
+ {update, public_key, soft, soft_purge, soft_purge, []},
+ {update, pubkey_cert, soft, soft_purge, soft_purge, []},
+ ]
+ },
{"0.11",
[
{update, public_key, soft, soft_purge, soft_purge, []},
@@ -35,6 +41,12 @@
}
],
[
+ {"0.12",
+ [
+ {update, public_key, soft, soft_purge, soft_purge, []},
+ {update, pubkey_cert, soft, soft_purge, soft_purge, []},
+ ]
+ },
{"0.11",
[
{update, public_key, soft, soft_purge, soft_purge, []},
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index 3c6b012152..66ac78a65d 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 0.12
+PUBLIC_KEY_VSN = 0.13