diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-08-13 02:29:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-08-13 02:29:11 (GMT) |
| commit | eb4541569d4fdfb1cbdf503cfbf433e63d79b663 (patch) | |
| tree | 7622aa9f5abe57b4af530743a37ba057f23acdb4 /Makefile | |
| parent | a40145809902852975369e30b63c7f8e68e6610a (diff) | |
| parent | 076b0adcf9dac7bd9d18624087f679cc811aeb77 (diff) | |
| download | git-eb4541569d4fdfb1cbdf503cfbf433e63d79b663.zip git-eb4541569d4fdfb1cbdf503cfbf433e63d79b663.tar.gz git-eb4541569d4fdfb1cbdf503cfbf433e63d79b663.tar.bz2 | |
Merge branch 'js/read-tree'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -227,7 +227,7 @@ LIB_H = \ blob.h cache.h commit.h csum-file.h delta.h \ diff.h object.h pack.h pkt-line.h quote.h refs.h \ run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \ - tree-walk.h log-tree.h dir.h path-list.h builtin.h + tree-walk.h log-tree.h dir.h path-list.h unpack-trees.h builtin.h DIFF_OBJS = \ diff.o diff-lib.o diffcore-break.o diffcore-order.o \ @@ -242,7 +242,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 \ - alloc.o merge-file.o path-list.o help.o $(DIFF_OBJS) + alloc.o merge-file.o path-list.o help.o unpack-trees.o $(DIFF_OBJS) BUILTIN_OBJS = \ builtin-add.o \ |