Merge branch 'lt/maint-wrap-zlib'
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Jan 2009 00:55:17 +0000 (16:55 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Jan 2009 00:55:17 +0000 (16:55 -0800)
commit36dd9393938d4e7f8843c6c587c9b4db077377fc
tree068987295f97b419452a69d3c15b82882a9e1582
parent664a3348b22bd5fe5d2d97b9985edeaf3a34cb71
parent39c68542fc8d8477f2080c99efedb9dce975abc6
Merge branch 'lt/maint-wrap-zlib'

* lt/maint-wrap-zlib:
  Wrap inflate and other zlib routines for better error reporting

Conflicts:
http-push.c
http-walker.c
sha1_file.c
builtin-apply.c
builtin-pack-objects.c
builtin-unpack-objects.c
cache.h
http-push.c
http-walker.c
index-pack.c
sha1_file.c