Merge branch 'js/bundle'

diff --git a/Makefile b/Makefile
index 8a42be9babb04a2a9f6eb0fba24a5fc8b5fe59a1..23ab7d6f9f6554169de554b53042bc2d99bf4fed 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -277,6 +277,7 @@ BUILTIN_OBJS = \
        builtin-archive.o \
        builtin-blame.o \
        builtin-branch.o \
+       builtin-bundle.o \
        builtin-cat-file.o \
        builtin-checkout-index.o \
        builtin-check-ref-format.o \