diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-19 18:47:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-19 18:47:29 -0700 |
| commit | b19beecd9456a2e6282634e5df751206b972604a (patch) | |
| tree | 52617650de39f12bbeb351acf7fb5c9b5becf5cb /Makefile | |
| parent | 474bc4e274322606fb9fd0f6edffb9ac7fd4a7a9 (diff) | |
| parent | 1f1e895fccc52a1e227c464c4558d74604301a9f (diff) | |
| download | git-b19beecd9456a2e6282634e5df751206b972604a.tar.gz | |
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -215,7 +215,7 @@ LIB_OBJS = \ server-info.o setup.o sha1_file.o sha1_name.o strbuf.o \ tag.o tree.o usage.o config.o environment.o ctype.o copy.o \ fetch-clone.o revision.o pager.o tree-walk.o xdiff-interface.o \ - $(DIFF_OBJS) + alloc.o $(DIFF_OBJS) BUILTIN_OBJS = \ builtin-log.o builtin-help.o builtin-count.o builtin-diff.o builtin-push.o \ |