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)
* 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.

1  2 
Makefile
builtin-apply.c

diff --cc Makefile
Simple merge
diff --cc builtin-apply.c
Simple merge