Merge branch 'jk/url-decode'

diff --git a/Makefile b/Makefile
index 5fa893c6fa5602bba9e11684203d3be3985c3f52..a07333b7c9bba3ada128dbf4dcdcaa0dd88d5ab2 100644 (file)
--- 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