diff options
| author | Ingela Anderton Andin <[email protected]> | 2012-03-22 09:47:12 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2012-03-22 09:47:12 +0100 |
| commit | b2b96f8b37143e760cfe6638c6c4b3bd34604e1f (patch) | |
| tree | 40dbbc44fca6435982167e2f2e651bd6d429c067 | |
| parent | 69b111c9a7e84f380c673d93c2f44f5865999291 (diff) | |
| parent | ecf6c7e5896dbe6c7b23f3d5b87ac9833167e69b (diff) | |
| download | otp-b2b96f8b37143e760cfe6638c6c4b3bd34604e1f.tar.gz otp-b2b96f8b37143e760cfe6638c6c4b3bd34604e1f.tar.bz2 otp-b2b96f8b37143e760cfe6638c6c4b3bd34604e1f.zip | |
Merge branch 'ia/public_key/prepare-for-release' into maint
* ia/public_key/prepare-for-release:
Prepare for release
| -rw-r--r-- | lib/public_key/src/public_key.appup.src | 12 | ||||
| -rw-r--r-- | lib/public_key/vsn.mk | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/lib/public_key/src/public_key.appup.src b/lib/public_key/src/public_key.appup.src index 2945fb1213..aacd3b866d 100644 --- a/lib/public_key/src/public_key.appup.src +++ b/lib/public_key/src/public_key.appup.src @@ -1,16 +1,8 @@ %% -*- erlang -*- {"%VSN%", [ - {"0.13", [{restart_application, public_key}]}, - {"0.11", [{restart_application, public_key}]}, - {"0.10", [{restart_application, public_key}]}, - {"0.9", [{restart_application, public_key}]}, - {"0.8", [{restart_application, public_key}]} + {<<"0\\.*">>, [{restart_application, public_key}]} ], [ - {"0.13", [{restart_application, public_key}]}, - {"0.11", [{restart_application, public_key}]}, - {"0.10", [{restart_application, public_key}]}, - {"0.9", [{restart_application, public_key}]}, - {"0.8", [{restart_application, public_key}]} + {<<"0\\.*">>, [{restart_application, public_key}]} ]}. diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk index d8f811bf25..ab4ee8b0ff 100644 --- a/lib/public_key/vsn.mk +++ b/lib/public_key/vsn.mk @@ -1 +1 @@ -PUBLIC_KEY_VSN = 0.14 +PUBLIC_KEY_VSN = 0.15 |