![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Jul 2011 16:33:03 +0000 (09:33 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Jul 2011 16:33:04 +0000 (09:33 -0700) | ||
| commit | eb4f4076aa89d38221ee513a5f28f22124029c90 | |
| tree | 8617f31f2dada1ec300dff9427f92ba00ea95500 | tree | snapshot |
| parent | d37b2991b1edea76c01ec05cc383005b55c96e36 | commit | diff |
| parent | e01503b523e79748ac91d876f506811c597d03cb | commit | diff |
Merge branch 'jc/zlib-wrap'
* 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
Conflicts:
sha1_file.c
* 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
Conflicts:
sha1_file.c
| builtin/index-pack.c | diff1 | | diff2 | | blob | history |
| cache.h | diff1 | | diff2 | | blob | history |
| diff.c | diff1 | | diff2 | | blob | history |
| http-push.c | diff1 | | diff2 | | blob | history |
| http.h | diff1 | | diff2 | | blob | history |
| remote-curl.c | diff1 | | diff2 | | blob | history |
| sha1_file.c | diff1 | | diff2 | | blob | history |
| streaming.c | diff1 | | | | blob | history |