Merge branch 'lt/unitype'
commit5cd060b56c3d0b9f2340377d73dfe1abbcbe8a20
authorJunio C Hamano <junkio@cox.net>
Fri, 14 Jul 2006 22:39:19 +0000 (14 15:39 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 14 Jul 2006 22:39:19 +0000 (14 15:39 -0700)
treefc993f674db014236b94f3c6e147b1ac5b838699
parent1733832d8ec11655924af58efb67ff4503928b59
parente5a78b1ca8b62aee8567d67f0e0db5ac7706806a
Merge branch 'lt/unitype'

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