Merge branch 'fix'
commit975bf9cf5ad5d440f98f464ae8124609a4835ce1
authorJunio C Hamano <junkio@cox.net>
Sun, 14 May 2006 23:20:15 +0000 (14 16:20 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 14 May 2006 23:20:15 +0000 (14 16:20 -0700)
tree46949dec51c6df5416b8190bfddc73b226a5dd2f
parent5f7f211a54cb62fba4f017cdf3b9bc0c3a7843e1
parentd9635e9c539465792b1920437b52fa8792a71650
Merge branch 'fix'

* fix:
  include header to define uint32_t, necessary on Mac OS X
pack-objects.c
sha1_file.c