Merge 'fixes' branch

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Makefile b/Makefile
index f83c4951bc0c7b71d17d3244f33a41bbde8c119e..ac13ecbedff7d3e30bd180e25da2ec58150235b9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@
 
 # DEFINES += -DUSE_STDEV
 
-GIT_VERSION = 0.99.7
+GIT_VERSION = 0.99.7b
 
 CFLAGS = -g -O2 -Wall
 ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES)

diff --git a/debian/changelog b/debian/changelog
index 128513a455e8389e72520f00e96138a1ac26c042..e6ea7b946a4d21043821af309b0fdbd37c26b6de 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+git-core (0.99.7b-0) unstable; urgency=low
+
+  * GIT 0.99.7b
+
+ -- Junio C Hamano <junkio@cox.net>  Thu, 22 Sep 2005 21:46:44 -0700
+
+git-core (0.99.7a-0) unstable; urgency=low
+
+  * GIT 0.99.7a
+
+ -- Junio C Hamano <junkio@cox.net>  Mon, 19 Sep 2005 19:29:07 -0700
+
 git-core (0.99.7-0) unstable; urgency=low
 
   * GIT 0.99.7