Merge branch 'maint'

diff --git a/Makefile b/Makefile
index 79f961ee4bf85b488aaa1c3f3fb9b8b28b414872..e1583761dfa58c3ede93b2076e4aa0963f2aa379 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -696,6 +696,7 @@ LIB_H += merge-recursive.h
 LIB_H += mergesort.h
 LIB_H += notes-cache.h
 LIB_H += notes-merge.h
+LIB_H += notes-utils.h
 LIB_H += notes.h
 LIB_H += object.h
 LIB_H += pack-revindex.h
@@ -830,6 +831,7 @@ LIB_OBJS += name-hash.o
 LIB_OBJS += notes.o
 LIB_OBJS += notes-cache.o
 LIB_OBJS += notes-merge.o
+LIB_OBJS += notes-utils.o
 LIB_OBJS += object.o
 LIB_OBJS += pack-check.o
 LIB_OBJS += pack-revindex.o