From: Junio C Hamano <junkio@cox.net>
Date: Thu, 23 Feb 2006 03:20:55 +0000 (-0800)
Subject: Merge branch 'ml/cvs'
X-Git-Tag: v1.3.0-rc1~154
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/98214e96be00c5132047ae80bca20d4690933c33?ds=inline;hp=-c

Merge branch 'ml/cvs'

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

98214e96be00c5132047ae80bca20d4690933c33
diff --combined Makefile
index 4d8aad3711,2d21d4d3a5..e79aa96cc3
--- a/Makefile
+++ b/Makefile
@@@ -120,7 -120,7 +120,7 @@@ SCRIPT_SH = 
  	git-merge-one-file.sh git-parse-remote.sh \
  	git-prune.sh git-pull.sh git-push.sh git-rebase.sh \
  	git-repack.sh git-request-pull.sh git-reset.sh \
 -	git-resolve.sh git-revert.sh git-sh-setup.sh \
 +	git-resolve.sh git-revert.sh git-rm.sh git-sh-setup.sh \
  	git-tag.sh git-verify-tag.sh git-whatchanged.sh \
  	git-applymbox.sh git-applypatch.sh git-am.sh \
  	git-merge.sh git-merge-stupid.sh git-merge-octopus.sh \
@@@ -130,7 -130,7 +130,7 @@@
  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 = \