summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-18 18:16:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-18 18:16:55 (GMT)
commitbcacc0ebdb17b55040826bf82d1bde4070119250 (patch)
tree190507d06bd12dec65429c135b9ca340d844298d /Makefile
parent1c5d6b2a401576f74c76f56dae0204604235705c (diff)
parent9d2e942070b235e1f4a0b8dd4c55a6b3f0fe914a (diff)
downloadgit-bcacc0ebdb17b55040826bf82d1bde4070119250.zip
git-bcacc0ebdb17b55040826bf82d1bde4070119250.tar.gz
git-bcacc0ebdb17b55040826bf82d1bde4070119250.tar.bz2
Merge branch 'jk/url-decode'
* jk/url-decode: decode file:// and ssh:// URLs make url-related functions reusable
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 5fa893c..a07333b 100644
--- a/Makefile
+++ b/Makefile
@@ -627,6 +627,7 @@ LIB_OBJS += tree-diff.o
LIB_OBJS += tree.o
LIB_OBJS += tree-walk.o
LIB_OBJS += unpack-trees.o
+LIB_OBJS += url.o
LIB_OBJS += usage.o
LIB_OBJS += userdiff.o
LIB_OBJS += utf8.o