Merge branch 'rs/qsort-s' into maint

diff --git a/Makefile b/Makefile
index 461c845d33cbc5f201096ea4b3e1048492cb0a6a..043ec8377b72ff3d86193982eb866a2f055f752c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2037,7 +2037,6 @@ XDIFF_OBJS += xdiff/xhistogram.o
 
 VCSSVN_OBJS += vcs-svn/line_buffer.o
 VCSSVN_OBJS += vcs-svn/sliding_window.o
-VCSSVN_OBJS += vcs-svn/repo_tree.o
 VCSSVN_OBJS += vcs-svn/fast_export.o
 VCSSVN_OBJS += vcs-svn/svndiff.o
 VCSSVN_OBJS += vcs-svn/svndump.o