diff options
| author | Björn Gustavsson <[email protected]> | 2014-01-22 16:19:32 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2014-01-22 16:19:32 +0100 |
| commit | e99633a51cbd22b16606c2669c575c22cf1c511f (patch) | |
| tree | 784ef6b3eec7461e7b8962fee2d1ba6858b516b6 /erts/emulator/utils | |
| parent | 990b655c92f889d2c45e6f43ee6fdae29ffc8464 (diff) | |
| parent | 9f57d8c4f86323cf7481c9a7e512486087bb5542 (diff) | |
| download | otp-e99633a51cbd22b16606c2669c575c22cf1c511f.tar.gz otp-e99633a51cbd22b16606c2669c575c22cf1c511f.tar.bz2 otp-e99633a51cbd22b16606c2669c575c22cf1c511f.zip | |
Merge branch 'bjorn/erts/zlib-1.2.8'
* bjorn/erts/zlib-1.2.8:
configure: Prefer the system's zlib over own our zlib source
Update preloaded modules
Add the 'rle' zstrategy
Don't make gzio.c dependent on the zutil.h header file
Update zlib to 1.2.8
erts/zlib: Remove unused file example.c
Diffstat (limited to 'erts/emulator/utils')
0 files changed, 0 insertions, 0 deletions