1
0
mirror of https://github.com/git/git.git synced 2024-11-18 05:03:56 +01:00

Merge with master.

This merges commit
    3c4e8a636f4de3668b24d0020df731cdc78ae6e9
from master into our head commit
    80f45687f44b6258b0eacae6b1ae15e3ad4a6552

Sincerely,
    jit-merge command.
This commit is contained in:
Junio C Hamano 2005-08-08 18:02:39 -07:00
commit e764a10b17

@ -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)