]> asedeno.scripts.mit.edu Git - git.git/commitdiff
Merge branch 'lt/objlist' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 20 Jun 2006 01:47:29 +0000 (18:47 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 20 Jun 2006 01:47:29 +0000 (18:47 -0700)
* 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

1  2 
Makefile
diff-lib.c
http-push.c

diff --cc Makefile
Simple merge
diff --cc diff-lib.c
Simple merge
diff --cc http-push.c
Simple merge