Merge master into rc

diff --git a/Makefile b/Makefile
index 76f36cd..ff3d7e3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@
 
 # DEFINES += -DUSE_STDEV
 
-GIT_VERSION = 0.99.4
+GIT_VERSION = 0.99.5
 
 CFLAGS = -g -O2 -Wall
 ALL_CFLAGS = $(CFLAGS) $(DEFINES)

diff --git a/debian/changelog b/debian/changelog
index 2788cdd..da7526e 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-4) unstable; urgency=low
 
   * Mark git-tk as architecture neutral.