From: Junio C Hamano <junkio@cox.net>
Date: Wed, 22 Feb 2006 10:17:56 +0000 (-0800)
Subject: Merge branch 'ml/cvs' into next
X-Git-Tag: v1.3.0-rc1~54^2~44
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=a35ed7cbd19d54edb9862d9cf66343db982063ab;hp=-c;p=git.git

Merge branch 'ml/cvs' into next

* ml/cvs:
  Introducing git-cvsserver -- a CVS emulator for git.
---

a35ed7cbd19d54edb9862d9cf66343db982063ab
diff --combined Makefile
index d13e7e9d,2d21d4d3..e2fba958
--- a/Makefile
+++ b/Makefile
@@@ -130,7 -130,7 +130,7 @@@ SCRIPT_SH = 
  SCRIPT_PERL = \
  	git-archimport.perl git-cvsimport.perl git-relink.perl \
  	git-shortlog.perl git-fmt-merge-msg.perl git-rerere.perl \
- 	git-annotate.perl \
 -	git-cvsserver.perl \
++	git-annotate.perl git-cvsserver.perl \
  	git-svnimport.perl git-mv.perl git-cvsexportcommit.perl
  
  SCRIPT_PYTHON = \
@@@ -165,7 -165,7 +165,7 @@@ PROGRAMS = 
  	git-upload-pack$X git-verify-pack$X git-write-tree$X \
  	git-update-ref$X git-symbolic-ref$X git-check-ref-format$X \
  	git-name-rev$X git-pack-redundant$X git-repo-config$X git-var$X \
 -	git-describe$X git-merge-tree$X
 +	git-describe$X git-merge-tree$X git-blame$X
  
  # what 'all' will build and 'install' will install, in gitexecdir
  ALL_PROGRAMS = $(PROGRAMS) $(SIMPLE_PROGRAMS) $(SCRIPTS)