diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-08 18:02:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-08 18:02:39 -0700 |
| commit | e764a10b17610ed9b3969bdb351e09f9635eb0ab (patch) | |
| tree | 7bfb70afc16be8332f0ad177ec2d0cc878047b6e /Makefile | |
| parent | 80f45687f44b6258b0eacae6b1ae15e3ad4a6552 (diff) | |
| parent | 3c4e8a636f4de3668b24d0020df731cdc78ae6e9 (diff) | |
| download | git-e764a10b17610ed9b3969bdb351e09f9635eb0ab.tar.gz git-e764a10b17610ed9b3969bdb351e09f9635eb0ab.tar.xz | |
Merge with master.
This merges commit
3c4e8a636f4de3668b24d0020df731cdc78ae6e9
from master into our head commit
80f45687f44b6258b0eacae6b1ae15e3ad4a6552
Sincerely,
jit-merge command.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -174,6 +174,7 @@ init-db.o: init-db.c $(CC) -c $(CFLAGS) -DDEFAULT_GIT_TEMPLATE_DIR='"$(template_dir)"' $*.c $(LIB_OBJS): $(LIB_H) +$(patsubst git-%,%.o,$(PROG)): $(LIB_H) $(DIFF_OBJS): diffcore.h $(LIB_FILE): $(LIB_OBJS) |