diff options
author | Ingela Anderton Andin <[email protected]> | 2010-12-01 10:28:24 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2010-12-01 10:28:24 +0100 |
commit | 6a0877cc8ff8157e055d6216dfee2293c648601c (patch) | |
tree | 487fb9579e28aaebdb95ef203f2b3351c5a16b71 /lib/ssl/src/ssl_cipher.erl | |
parent | 7369151bc24d9d3b0b1ebed19a1a7d0df9101a81 (diff) | |
parent | 3326cab005954dc6ba6c6596f77b5882b77f6be2 (diff) | |
download | otp-6a0877cc8ff8157e055d6216dfee2293c648601c.tar.gz otp-6a0877cc8ff8157e055d6216dfee2293c648601c.tar.bz2 otp-6a0877cc8ff8157e055d6216dfee2293c648601c.zip |
Merge branch 'ia/ssl-and-public_key-doc-and-dialyzer-fixes' into dev
* ia/ssl-and-public_key-doc-and-dialyzer-fixes:
Fixed guard and test case
Fixed broken links in the documentation and dialyzer warnings
Diffstat (limited to 'lib/ssl/src/ssl_cipher.erl')
-rw-r--r-- | lib/ssl/src/ssl_cipher.erl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_cipher.erl b/lib/ssl/src/ssl_cipher.erl index 1c8bbbaf06..72f02a4362 100644 --- a/lib/ssl/src/ssl_cipher.erl +++ b/lib/ssl/src/ssl_cipher.erl @@ -29,7 +29,6 @@ -include("ssl_record.hrl"). -include("ssl_cipher.hrl"). -include("ssl_alert.hrl"). --include("ssl_debug.hrl"). -include_lib("public_key/include/public_key.hrl"). -export([security_parameters/2, suite_definition/1, |