Merge branch 'fixes'

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

diff --git a/compat/subprocess.py b/compat/subprocess.py
index d115e87..93323df 100644 (file)
--- a/compat/subprocess.py
+++ b/compat/subprocess.py
@@ -24,6 +24,9 @@
 # OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Use of this file within git is permitted under GPLv2.
+#
 
 r"""subprocess - Subprocesses with accessible I/O streams
 

diff --git a/debian/changelog b/debian/changelog
index 128513a..614494c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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