diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-04-17 09:42:32 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-04-17 09:42:32 +0200 |
| commit | c0a6d9b712a2685443f0351fa589c520f624d872 (patch) | |
| tree | 09754ec0bf281b1971e344af4d316b2a6a42f074 /lib | |
| parent | 7a20be2ac86dc6f65f20c20af044eaa07417fb2b (diff) | |
| parent | 98b55a9b54542cbb3db44ee22d199f15aeb912d4 (diff) | |
| download | otp-c0a6d9b712a2685443f0351fa589c520f624d872.tar.gz otp-c0a6d9b712a2685443f0351fa589c520f624d872.tar.bz2 otp-c0a6d9b712a2685443f0351fa589c520f624d872.zip | |
Merge branch 'ia/ssl/inet-dep'
* ia/ssl/inet-dep:
ssl: Add runtime depenency due to commit 4e0a5e36b38e3f15ed8f7d700d26f2424a47111c
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/src/ssl.app.src | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src index 955875fa95..20c7c3daa6 100644 --- a/lib/ssl/src/ssl.app.src +++ b/lib/ssl/src/ssl.app.src @@ -54,6 +54,6 @@ {env, []}, {mod, {ssl_app, []}}, {runtime_dependencies, ["stdlib-2.0","public_key-0.22","kernel-3.0", - "erts-6.0","crypto-3.3"]}]}. + "erts-6.0","crypto-3.3", "inets-5.10.7"]}]}. |