Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Sun, 5 Nov 2006 07:52:32 +0000 (23:52 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 5 Nov 2006 07:52:32 +0000 (23:52 -0800)
commit82cc8d839bbfd3d13f308145bdae4c9622de57e2
treee574b2dc248b35c14478359070c90b0bb21fe363
parentb2e2ddfed8006590bc5b8f4f2a22046891958f28
parent6c2f207b2316149ee8dfaf026e4a869ff9ab42f7
Merge branch 'maint'

* maint:
  Remove unsupported C99 style struct initializers in git-archive.
  Remove SIMPLE_PROGRAMS and make git-daemon a normal program.
  Use ULONG_MAX rather than implicit cast of -1.
Makefile
builtin-apply.c