Merge branch 'fix' into maint
authorJunio C Hamano <junkio@cox.net>
Sun, 14 May 2006 23:20:09 +0000 (16:20 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 14 May 2006 23:20:09 +0000 (16:20 -0700)
commit3f22deb7f58dff426a0853de62cc553ec97d6bf8
tree281a426f68823461874bf3d418ef217210e229fa
parentd14f776402d9f7040cc71ff6e3b992b2e019526a
parentd9635e9c539465792b1920437b52fa8792a71650
Merge branch 'fix' into maint

* fix:
  include header to define uint32_t, necessary on Mac OS X