From: Junio C Hamano <junkio@cox.net>
Date: Tue, 30 Aug 2005 21:33:27 +0000 (-0700)
Subject: Merge refs/heads/master from .
X-Git-Tag: v0.99.6^2~6
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=fc1a4207b025ddd79d6383ed06f786c8a6f03289;hp=5da22bc14b6a8329c181067ad8a8b383dab512fc;p=git.git

Merge refs/heads/master from .
---

diff --git a/Makefile b/Makefile
index 007d42b03..f13ff5aa2 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 5b7b4d3ff..f3cf358fb 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