From: Junio C Hamano <junkio@cox.net>
Date: Wed, 17 Aug 2005 05:30:46 +0000 (-0700)
Subject: Merge with master to get diff fixes.
X-Git-Tag: v0.99.5~17
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6680153441de6fbba07868d5f54af74d31a3ff13?hp=-c

Merge with master to get diff fixes.
---

6680153441de6fbba07868d5f54af74d31a3ff13
diff --combined Makefile
index 1623247273,db7596504a..c0a84298b5
--- a/Makefile
+++ b/Makefile
@@@ -32,7 -32,7 +32,7 @@@
  
  # DEFINES += -DUSE_STDEV
  
 -GIT_VERSION = 0.99.4
 +GIT_VERSION = 0.99.5
  
  CFLAGS = -g -O2 -Wall
  ALL_CFLAGS = $(CFLAGS) $(DEFINES)
@@@ -97,7 -97,7 +97,7 @@@ LIB_H=cache.h object.h blob.h tree.h co
  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