Merge branch 'master' of .

diff --git a/Makefile b/Makefile
index 5b028b1d9482b1299b912e81d3d9b2e428b7eda8..3f699864ea16556a37de0661bed878c27ee2f18b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@
 
 # DEFINES += -DUSE_STDEV
 
-GIT_VERSION = 0.99.6
+GIT_VERSION = 0.99.7
 
 CFLAGS = -g -O2 -Wall
 ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES)

diff --git a/debian/changelog b/debian/changelog
index 9ea9e523b650587b1e2ccc071c2b7a62cc6af626..128513a455e8389e72520f00e96138a1ac26c042 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-core (0.99.7-0) unstable; urgency=low
+
+  * GIT 0.99.7
+
+ -- Junio C Hamano <junkio@cox.net>  Sat, 10 Sep 2005 18:36:39 -0700
+
 git-core (0.99.6-0) unstable; urgency=low
 
   * GIT 0.99.6