Merge branch 'jm/mem-pool'

diff --git a/Makefile b/Makefile
index e7191a7e60819465bf90d9fd062fa75e8aee6212..50da82b0169ad7569a900a5b7dbd0b98f147a7f0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -845,6 +845,7 @@ LIB_OBJS += log-tree.o
 LIB_OBJS += mailinfo.o
 LIB_OBJS += mailmap.o
 LIB_OBJS += match-trees.o
+LIB_OBJS += mem-pool.o
 LIB_OBJS += merge.o
 LIB_OBJS += merge-blobs.o
 LIB_OBJS += merge-recursive.o