Merge changes in the master branch into 0.99.5 preparation branch.

diff --git a/Makefile b/Makefile
index e8441af..6bc3ed7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@
 
 # DEFINES += -DUSE_STDEV
 
-GIT_VERSION=0.99.4
+GIT_VERSION=0.99.5
 
 COPTS?=-g -O2
 CFLAGS+=$(COPTS) -Wall $(DEFINES)

diff --git a/debian/changelog b/debian/changelog
index 85d4d00..28cfb0f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-core (0.99.5-0) unstable; urgency=low
+
+  * GIT 0.99.5
+
+ -- Junio C Hamano <junkio@cox.net>  Wed, 10 Aug 2005 22:05:00 -0700
+
 git-core (0.99.4-3) unstable; urgency=low
 
   * Split off gitk.