aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public_key/src/public_key.appup.src
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-09-23 14:10:53 +0200
committerMicael Karlberg <[email protected]>2011-09-23 14:10:53 +0200
commit524ad34276ef31fc5c306943539e3fe9bd19ad8c (patch)
treeb6d497f9461375b02527bc3d1f10c7a58f3e38e0 /lib/public_key/src/public_key.appup.src
parent3f9de4601b8539eea14de2d1517f54956e05d03a (diff)
parent92657321ac647f343c6b88985d66a2d611fd982d (diff)
downloadotp-524ad34276ef31fc5c306943539e3fe9bd19ad8c.tar.gz
otp-524ad34276ef31fc5c306943539e3fe9bd19ad8c.tar.bz2
otp-524ad34276ef31fc5c306943539e3fe9bd19ad8c.zip
Merge branch 'major' of super:otp into bmk/inets/inets58_integration
Diffstat (limited to 'lib/public_key/src/public_key.appup.src')
-rw-r--r--lib/public_key/src/public_key.appup.src12
1 files changed, 12 insertions, 0 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, []},