diff options
| author | Erlang/OTP <[email protected]> | 2011-09-19 12:24:31 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2011-09-19 12:24:31 +0200 |
| commit | 1a7a9e3d20383953047c16ac80fa1898e58e153a (patch) | |
| tree | 8f0a6bed21549b74b0a48e556fd1606b71cbefbf /erts/emulator/zlib/Makefile | |
| parent | 801ec3847e330b7d67b1e4ae700211380da0d6bd (diff) | |
| parent | 0159f7a9598c1d88b2e184dcc442c254ef8f14c9 (diff) | |
| download | otp-1a7a9e3d20383953047c16ac80fa1898e58e153a.tar.gz otp-1a7a9e3d20383953047c16ac80fa1898e58e153a.tar.bz2 otp-1a7a9e3d20383953047c16ac80fa1898e58e153a.zip | |
Merge branch 'raimo/sctp-getsetopts/OTP-9544' into maint-r13
* raimo/sctp-getsetopts/OTP-9544:
erts,kernel: Bugfix - read SCTP socket options from right protocol layer
erts: Fix bug SCTP send can only be called from controlling process
Diffstat (limited to 'erts/emulator/zlib/Makefile')
0 files changed, 0 insertions, 0 deletions