Merge git://repo.or.cz/git-gui

diff --git a/Makefile b/Makefile
index 514738046f94abc9ab16bfebc3b0d3e0118b5a5f..e3eaa6a543e7c3eed8a72c00f8b5541524fc9508 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -247,7 +247,7 @@ SCRIPT_SH = \
 SCRIPT_PERL = \
        git-add--interactive.perl \
        git-archimport.perl git-cvsimport.perl git-relink.perl \
-       git-cvsserver.perl git-remote.perl git-cvsexportcommit.perl \
+       git-cvsserver.perl git-cvsexportcommit.perl \
        git-send-email.perl git-svn.perl
 
 SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
@@ -385,6 +385,7 @@ BUILTIN_OBJS = \
        builtin-push.o \
        builtin-read-tree.o \
        builtin-reflog.o \
+       builtin-remote.o \
        builtin-send-pack.o \
        builtin-config.o \
        builtin-rerere.o \