diff options
| author | Raimo Niskanen <[email protected]> | 2011-09-28 12:08:49 +0200 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2011-09-28 12:08:49 +0200 |
| commit | fde38fa8d3120e6aa479f7720654114df9cd4ec8 (patch) | |
| tree | 082ef5d9fc6af70be3b593d160f06b8f90048ad7 /erts/preloaded/src/prim_zip.erl | |
| parent | 32ad9d12c8d600495bb8c206967ffb3172786e3e (diff) | |
| parent | 30937b22530827f0e4686494230d17a15ff7accb (diff) | |
| download | otp-fde38fa8d3120e6aa479f7720654114df9cd4ec8.tar.gz otp-fde38fa8d3120e6aa479f7720654114df9cd4ec8.tar.bz2 otp-fde38fa8d3120e6aa479f7720654114df9cd4ec8.zip | |
Merge branch 'raimo/sctp-getsetopts-dev/OTP-9544' into dev
* raimo/sctp-getsetopts-dev/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/preloaded/src/prim_zip.erl')
0 files changed, 0 insertions, 0 deletions