diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-07-19 09:33:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-19 09:33:04 -0700 |
| commit | eb4f4076aa89d38221ee513a5f28f22124029c90 (patch) | |
| tree | 8617f31f2dada1ec300dff9427f92ba00ea95500 /git-difftool.perl | |
| parent | Merge branch 'ak/gcc46-profile-feedback' (diff) | |
| parent | zlib: allow feeding more than 4GB in one go (diff) | |
| download | tgif-eb4f4076aa89d38221ee513a5f28f22124029c90.tar.xz | |
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
Diffstat (limited to 'git-difftool.perl')
0 files changed, 0 insertions, 0 deletions