diff options
| author | Ingela Anderton Andin <ingela@erlang.org> | 2012-03-22 09:50:03 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <ingela@erlang.org> | 2012-03-22 09:50:03 +0100 |
| commit | 5d7ed57d07118f95cf970ee655ea8eea76cbe6fd (patch) | |
| tree | c59721c8a811f3185290c0a25d1085b85993ca12 /lib/public_key | |
| parent | 2497698a1715462d8785179eacb9975adb35a767 (diff) | |
| parent | b2b96f8b37143e760cfe6638c6c4b3bd34604e1f (diff) | |
| download | otp-5d7ed57d07118f95cf970ee655ea8eea76cbe6fd.tar.gz otp-5d7ed57d07118f95cf970ee655ea8eea76cbe6fd.tar.bz2 otp-5d7ed57d07118f95cf970ee655ea8eea76cbe6fd.zip | |
Merge remote branch 'upstream/maint'
* upstream/maint:
Prepare for release
Prepare for release
Prepare for release
Diffstat (limited to 'lib/public_key')
| -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 |