Code

Merge branch 'fix'
authorJunio C Hamano <junkio@cox.net>
Sun, 14 May 2006 23:20:15 +0000 (16:20 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 14 May 2006 23:20:15 +0000 (16:20 -0700)
* fix:
  include header to define uint32_t, necessary on Mac OS X

1  2 
pack-objects.c
sha1_file.c

diff --cc pack-objects.c
Simple merge
diff --cc sha1_file.c
Simple merge