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.octo.it/?a=commitdiff_plain;h=98214e96be00c5132047ae80bca20d4690933c33;p=git.git

Merge branch 'ml/cvs'

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

98214e96be00c5132047ae80bca20d4690933c33
diff --cc Makefile
index 4d8aad37,2d21d4d3..e79aa96c
--- 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 = \