diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-08-16 18:23:26 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-08-16 18:23:26 (GMT) |
commit | a35d78c0f483a65ea96c4f0c9a825bf28a386273 (patch) | |
tree | a20407fc5fbce3b190a364d10c47d807433ec9a5 /t/t3310-notes-merge-manual-resolve.sh | |
parent | 184cb4d6899a2644b07c11bef71df869a851f525 (diff) | |
parent | e01503b523e79748ac91d876f506811c597d03cb (diff) | |
download | git-a35d78c0f483a65ea96c4f0c9a825bf28a386273.zip git-a35d78c0f483a65ea96c4f0c9a825bf28a386273.tar.gz git-a35d78c0f483a65ea96c4f0c9a825bf28a386273.tar.bz2 |
Merge branch 'jc/zlib-wrap' into maint
* jc/zlib-wrap:
zlib: allow feeding more than 4GB in one go
zlib: zlib can only process 4GB at a time
zlib: wrap deflateBound() too
zlib: wrap deflate side of the API
zlib: wrap inflateInit2 used to accept only for gzip format
zlib: wrap remaining calls to direct inflate/inflateEnd
zlib wrapper: refactor error message formatter
Diffstat (limited to 't/t3310-notes-merge-manual-resolve.sh')
0 files changed, 0 insertions, 0 deletions