diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-03-08 10:00:37 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-03-08 10:00:37 +0100 |
| commit | 0edb60a6cd946de768690fa945c1a0f655accc10 (patch) | |
| tree | 242578a80928b6b7f82bf8bd351b5c520e33a37b | |
| parent | 442fcfd70f0ddc9bd6ca029f5da1de6a0dee5b05 (diff) | |
| parent | 74e71bc0fb42f392dfd638f040055d4cb4f0f832 (diff) | |
| download | otp-0edb60a6cd946de768690fa945c1a0f655accc10.tar.gz otp-0edb60a6cd946de768690fa945c1a0f655accc10.tar.bz2 otp-0edb60a6cd946de768690fa945c1a0f655accc10.zip | |
Merge branch 'ia/ssl/prepare-release' into dev
* ia/ssl/prepare-release:
Prepare for release
| -rw-r--r-- | lib/ssl/src/ssl.appup.src | 2 | ||||
| -rw-r--r-- | lib/ssl/vsn.mk | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src index e6a8c557fc..d3e426f254 100644 --- a/lib/ssl/src/ssl.appup.src +++ b/lib/ssl/src/ssl.appup.src @@ -1,12 +1,14 @@ %% -*- erlang -*- {"%VSN%", [ + {"4.1.3", [{restart_application, ssl}]}, {"4.1.2", [{restart_application, ssl}]}, {"4.1.1", [{restart_application, ssl}]}, {"4.1", [{restart_application, ssl}]}, {"4.0.1", [{restart_application, ssl}]} ], [ + {"4.1.3", [{restart_application, ssl}]}, {"4.1.2", [{restart_application, ssl}]}, {"4.1.1", [{restart_application, ssl}]}, {"4.1", [{restart_application, ssl}]}, diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk index a4be7bb889..2f1edfa186 100644 --- a/lib/ssl/vsn.mk +++ b/lib/ssl/vsn.mk @@ -1,2 +1 @@ - -SSL_VSN = 4.1.3 +SSL_VSN = 4.1.4 |