diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-28 03:24:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-28 03:24:36 (GMT) |
| commit | 2d2b3fd8485eee6dd238b930f2592535730089a4 (patch) | |
| tree | 642dc8866db7840ef247164bee3435cf805ee03e /Makefile | |
| parent | 14de7393f1eca05c99f785cc2f43281da2c46e9e (diff) | |
| parent | 7de1950cb28cee7d6b1e9cdaf22f30ddcdc5bd01 (diff) | |
| download | git-2d2b3fd8485eee6dd238b930f2592535730089a4.zip git-2d2b3fd8485eee6dd238b930f2592535730089a4.tar.gz git-2d2b3fd8485eee6dd238b930f2592535730089a4.tar.bz2 | |
Merge branch 'rs/strbuf-expand'
* rs/strbuf-expand:
remove the unused files interpolate.c and interpolate.h
daemon: deglobalize variable 'directory'
daemon: inline fill_in_extra_table_entries()
daemon: use strbuf_expand() instead of interpolate()
merge-recursive: use strbuf_expand() instead of interpolate()
add strbuf_expand_dict_cb(), a helper for simple cases
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -437,7 +437,6 @@ LIB_OBJS += grep.o LIB_OBJS += hash.o LIB_OBJS += help.o LIB_OBJS += ident.o -LIB_OBJS += interpolate.o LIB_OBJS += levenshtein.o LIB_OBJS += list-objects.o LIB_OBJS += ll-merge.o |