From: Junio C Hamano <junkio@cox.net>
Date: Sun, 5 Nov 2006 07:52:32 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.4.4-rc1~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82cc8d839bbfd3d13f308145bdae4c9622de57e2;p=thirdparty%2Fgit.git

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

82cc8d839bbfd3d13f308145bdae4c9622de57e2