Merge branch 'fix'
commit3a3e89b897e122f1f154293e55b1d6c863ffbd2c
authorJunio C Hamano <junkio@cox.net>
Sun, 14 May 2006 05:24:18 +0000 (13 22:24 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 14 May 2006 05:24:18 +0000 (13 22:24 -0700)
tree08240a87cd86d4f07ecef955257bca1abd8afd91
parent639ca5497279607665847f2e3a11064441a8f2a6
parent66561f5a776f2343331fff5b98adff1000622f42
Merge branch 'fix'

* fix:
  Fix git-pack-objects for 64-bit platforms
pack-objects.c
sha1_file.c