summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-08-17 05:30:46 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-17 05:30:46 (GMT)
commit6680153441de6fbba07868d5f54af74d31a3ff13 (patch)
tree200df64306c16fb12a5068092d92237ba33cd7b9 /Makefile
parent7de94155add87f7cd8aaddbef224669e62d3302a (diff)
parent6bff6a60680ef402f614abae8189c2cb198cfa49 (diff)
downloadgit-6680153441de6fbba07868d5f54af74d31a3ff13.zip
git-6680153441de6fbba07868d5f54af74d31a3ff13.tar.gz
git-6680153441de6fbba07868d5f54af74d31a3ff13.tar.bz2
Merge with master to get diff fixes.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1623247..c0a8429 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,7 @@ LIB_H=cache.h object.h blob.h tree.h commit.h tag.h delta.h epoch.h csum-file.h
LIB_OBJS=read-cache.o sha1_file.o usage.o object.o commit.o tree.o blob.o \
tag.o date.o index.o diff-delta.o patch-delta.o entry.o path.o \
refs.o csum-file.o pack-check.o pkt-line.o connect.o ident.o \
- sha1_name.o
+ sha1_name.o setup.o
LIB_H += rev-cache.h
LIB_OBJS += rev-cache.o