From: Junio C Hamano <junkio@cox.net>
Date: Fri, 14 Jul 2006 22:39:19 +0000 (-0700)
Subject: Merge branch 'lt/unitype'
X-Git-Tag: v1.4.2-rc1~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5cd060b56c3d0b9f2340377d73dfe1abbcbe8a20;p=git.git

Merge branch 'lt/unitype'

* lt/unitype:
  builtin-prune.c: forgot TYPE => OBJ changes.
  Remove TYPE_* constant macros and use object_type enums consistently.
---

5cd060b56c3d0b9f2340377d73dfe1abbcbe8a20