From: Junio C Hamano <junkio@cox.net>
Date: Mon, 29 Aug 2005 06:03:23 +0000 (-0700)
Subject: Merge refs/heads/master from .
X-Git-Tag: v0.99.6^2~12
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=8c1f5f0f1f9c36ef5465512753efeff36758ba7d;hp=10d781b9caa4f71495c7b34963bef137216f86a8;p=git.git

Merge refs/heads/master from .
---

diff --git a/Makefile b/Makefile
index c0fdaa70..57d4f117 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@
 
 # DEFINES += -DUSE_STDEV
 
-GIT_VERSION = 0.99.5
+GIT_VERSION = 0.99.6
 
 CFLAGS = -g -O2 -Wall
 ALL_CFLAGS = $(CFLAGS) $(DEFINES)
diff --git a/debian/changelog b/debian/changelog
index 5b7b4d3f..f3cf358f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-core (0.99.6-0) unstable; urgency=low
+
+  * GIT 0.99.6
+
+ -- Junio C Hamano <junkio@cox.net>  Wed, 24 Aug 2005 23:09:35 -0700
+
 git-core (0.99.5-1) unstable; urgency=low
 
   * Enable git-send-email-script on Debian.  There is no reason to shy