diff options
| author | Henrik Nord <[email protected]> | 2015-03-09 14:26:39 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2015-03-09 14:26:39 +0100 |
| commit | 7d1039b311fcbd5f833856d7eac7a360c253a436 (patch) | |
| tree | 058865c85325b5b6783b78a77302c1d9b4ac21dd /erts/emulator/beam/erl_alloc.c | |
| parent | 735871e63c86814a0f099ab422b4d5bc8821579a (diff) | |
| parent | b24651c3bb6fef59c0e92c24e69151d1a92c4b08 (diff) | |
| download | otp-7d1039b311fcbd5f833856d7eac7a360c253a436.tar.gz otp-7d1039b311fcbd5f833856d7eac7a360c253a436.tar.bz2 otp-7d1039b311fcbd5f833856d7eac7a360c253a436.zip | |
Merge branch 'seriyps/zlib-inflate-bound'
* seriyps/zlib-inflate-bound:
Add zlib limited output buffer size functionality
Conflicts:
erts/preloaded/ebin/zlib.beam
OTP-12548
Diffstat (limited to 'erts/emulator/beam/erl_alloc.c')
0 files changed, 0 insertions, 0 deletions