diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-10-01 11:39:30 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-10-01 11:39:30 +0200 |
| commit | 132e46f29297ab3de25b33bd52ddbad078900276 (patch) | |
| tree | f9241b069e803936f80f5d90ec06a9a5ac946e55 /lib/public_key/src/public_key.appup.src | |
| parent | 800a07c5a386a79465ad33e5015ba20bad2ccc62 (diff) | |
| parent | 9c6842dbbe45bdf1568f165cc135257c4addbe0e (diff) | |
| download | otp-132e46f29297ab3de25b33bd52ddbad078900276.tar.gz otp-132e46f29297ab3de25b33bd52ddbad078900276.tar.bz2 otp-132e46f29297ab3de25b33bd52ddbad078900276.zip | |
Merge branch 'maint-r14' into dev
Conflicts:
lib/public_key/src/pubkey_cert.erl
Diffstat (limited to 'lib/public_key/src/public_key.appup.src')
| -rw-r--r-- | lib/public_key/src/public_key.appup.src | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/public_key/src/public_key.appup.src b/lib/public_key/src/public_key.appup.src index adc50d1d45..0f9f62d2f6 100644 --- a/lib/public_key/src/public_key.appup.src +++ b/lib/public_key/src/public_key.appup.src @@ -6,7 +6,7 @@ {update, 'OTP-PUB-KEY', soft, soft_purge, soft_purge, []}, {update, public_key, soft, soft_purge, soft_purge, []}, {update, pubkey_pem, soft, soft_purge, soft_purge, []}, - {update, pubkey_cert_records, soft, soft_purge, soft_purge, []} + {update, pubkey_cert_records, soft, soft_purge, soft_purge, []}, {update, pubkey_cert, soft, soft_purge, soft_purge, []} ] } @@ -17,7 +17,7 @@ {update, 'OTP-PUB-KEY', soft, soft_purge, soft_purge, []}, {update, public_key, soft, soft_purge, soft_purge, []}, {update, pubkey_pem, soft, soft_purge, soft_purge, []}, - {update, pubkey_cert_records, soft, soft_purge, soft_purge, []} + {update, pubkey_cert_records, soft, soft_purge, soft_purge, []}, {update, pubkey_cert, soft, soft_purge, soft_purge, []} ] } |