From: Junio C Hamano <junkio@cox.net>
Date: Tue, 8 Nov 2005 02:23:45 +0000 (-0800)
Subject: Merge branch 'master'
X-Git-Tag: v0.99.9f~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/77131db5855ed044e30706aa1219d79126686f00?ds=inline;hp=-c

Merge branch 'master'
---

77131db5855ed044e30706aa1219d79126686f00
diff --combined Makefile
index 56e0fb1ba6,b202be177b..ba1c6a736c
--- a/Makefile
+++ b/Makefile
@@@ -50,9 -50,10 +50,9 @@@
  # Define USE_STDEV below if you want git to care about the underlying device
  # change being considered an inode change from the update-cache perspective.
  
 -GIT_VERSION = 0.99.9.GIT
 +GIT_VERSION = 0.99.9e
  
  # CFLAGS is for the users to override from the command line.
 -
  CFLAGS = -g -O2 -Wall
  ALL_CFLAGS = $(CFLAGS)
  
@@@ -93,7 -94,7 +93,7 @@@ SCRIPT_SH = 
  SCRIPT_PERL = \
  	git-archimport.perl git-cvsimport.perl git-relink.perl \
  	git-rename.perl git-shortlog.perl git-fmt-merge-msg.perl \
- 	git-svnimport.perl git-mv.perl
+ 	git-svnimport.perl git-mv.perl git-cvsexportcommit.perl
  
  SCRIPT_PYTHON = \
  	git-merge-recursive.py