diff options
author | Sverker Eriksson <[email protected]> | 2017-02-01 14:37:50 +0100 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2017-02-01 14:37:50 +0100 |
commit | 2896c966d9456721a0b9c11dbd8a14c474a3ace0 (patch) | |
tree | 52779660d1c232a005febd46e1ec08dc740658e1 /lib/kernel/src/inet_int.hrl | |
parent | b54110ecf05e6403658f5ca8cfa180e287b7d90c (diff) | |
parent | e27119948fc6ab28bea81019720bddaac5b655a7 (diff) | |
download | otp-2896c966d9456721a0b9c11dbd8a14c474a3ace0.tar.gz otp-2896c966d9456721a0b9c11dbd8a14c474a3ace0.tar.bz2 otp-2896c966d9456721a0b9c11dbd8a14c474a3ace0.zip |
Merge branch 'sverker/bin2term-zlib-bug/ERL-340/OTP-14159' into maint
* sverker/bin2term-zlib-bug/ERL-340/OTP-14159:
erts: Fix binary_to_term for compressed and zlib >= v1.2.9
Diffstat (limited to 'lib/kernel/src/inet_int.hrl')
0 files changed, 0 insertions, 0 deletions