aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/ebin
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2017-10-25 08:58:33 +0200
committerJohn Högberg <[email protected]>2017-10-25 08:58:33 +0200
commit40e787f289a240e6a6b12e03b9501dc492c89aa9 (patch)
tree1298495e187d9830935c85c8fae691d8f3ba8a27 /erts/preloaded/ebin
parent9bbe5884cf620aa1c70b92b6e0f3a9d5c3866a9c (diff)
parentc26f0e58f440859abbfb9b4e3570713ac722e0da (diff)
downloadotp-40e787f289a240e6a6b12e03b9501dc492c89aa9.tar.gz
otp-40e787f289a240e6a6b12e03b9501dc492c89aa9.tar.bz2
otp-40e787f289a240e6a6b12e03b9501dc492c89aa9.zip
Merge branch 'maint'
* maint: Updated OTP version Update release notes Update version numbers erts: Fix so that bind correct schedulers Update version Fix error handling when decoding an AVP with an alternate dictionary Remove unused function arguments Fix faulty recursion vsn -> 2.1.2 Update appup for ERIERL-14684 Fix speling error 'sndbuf' -> 'recbuf' Add zlib:set_controlling_process/2
Diffstat (limited to 'erts/preloaded/ebin')
-rw-r--r--erts/preloaded/ebin/zlib.beambin19492 -> 19784 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/erts/preloaded/ebin/zlib.beam b/erts/preloaded/ebin/zlib.beam
index 5048bdb846..f388bc723a 100644
--- a/erts/preloaded/ebin/zlib.beam
+++ b/erts/preloaded/ebin/zlib.beam
Binary files differ