Merge branch 'maint'

diff --git a/Makefile b/Makefile
index fc30dcbbb9b665caa0da1bf56b8681da5b6c5473..de3e9f38ec9f737961ce29fa2b4e0703b8accfd2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -171,7 +171,7 @@ SCRIPT_SH = \
 
 SCRIPT_PERL = \
        git-archimport.perl git-cvsimport.perl git-relink.perl \
-       git-shortlog.perl git-rerere.perl \
+       git-rerere.perl \
        git-cvsserver.perl \
        git-svnimport.perl git-cvsexportcommit.perl \
        git-send-email.perl git-svn.perl
@@ -287,6 +287,7 @@ BUILTIN_OBJS = \
        builtin-rev-parse.o \
        builtin-rm.o \
        builtin-runstatus.o \
+       builtin-shortlog.o \
        builtin-show-branch.o \
        builtin-stripspace.o \
        builtin-symbolic-ref.o \