diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-04-16 15:23:25 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-04-16 15:23:25 +0200 |
| commit | df3617da7bbd944435f4679b8f8e0b668cb0e9e1 (patch) | |
| tree | b0496a7edfa2f6d5be38d7cfb5505d5625c148ae /lib/kernel/src | |
| parent | e40200f31b90d1ecfea1b5070dbf0bf9119cd8df (diff) | |
| parent | f1a49c45e4b2ec746407fd777ba31fec6cab118e (diff) | |
| download | otp-df3617da7bbd944435f4679b8f8e0b668cb0e9e1.tar.gz otp-df3617da7bbd944435f4679b8f8e0b668cb0e9e1.tar.bz2 otp-df3617da7bbd944435f4679b8f8e0b668cb0e9e1.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/gen_tcp.erl | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl index ef6bfdf7f4..e6dfdadb03 100644 --- a/lib/kernel/src/gen_tcp.erl +++ b/lib/kernel/src/gen_tcp.erl @@ -31,7 +31,6 @@ -type option() :: {active, true | false | once} | - {bit8, clear | set | on | off} | {buffer, non_neg_integer()} | {delay_send, boolean()} | {deliver, port | term} | @@ -61,7 +60,6 @@ {tos, non_neg_integer()}. -type option_name() :: active | - bit8 | buffer | delay_send | deliver | |