Merge branch 'lt/objlist' into next
commitb19beecd9456a2e6282634e5df751206b972604a
authorJunio C Hamano <junkio@cox.net>
Tue, 20 Jun 2006 01:47:29 +0000 (19 18:47 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 20 Jun 2006 01:47:29 +0000 (19 18:47 -0700)
tree52617650de39f12bbeb351acf7fb5c9b5becf5cb
parent474bc4e274322606fb9fd0f6edffb9ac7fd4a7a9
parent1f1e895fccc52a1e227c464c4558d74604301a9f
Merge branch 'lt/objlist' into next

* lt/objlist:
  Add "named object array" concept
  xdiff: minor changes to match libxdiff-0.21
  fix rfc2047 formatter.
  Fix t8001-annotate and t8002-blame for ActiveState Perl
  Add specialized object allocator
Makefile
diff-lib.c
http-push.c