From 06a01dc7a04d92c60210008435950afa9b6c0a69 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Fri, 6 Nov 2015 13:53:27 +0100
Subject: Merging upstream version 1.7.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
---
 ChangeLog | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index b907530..af69db0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,6 @@
-2015-05-23  Antonio Diaz Diaz  <antonio@gnu.org>
+2015-07-07  Antonio Diaz Diaz  <antonio@gnu.org>
 
-	* Version 1.7-rc1 released.
-	* main.c (compress): Fixed spurious warning about uninitialized var.
-
-2015-02-26  Antonio Diaz Diaz  <antonio@gnu.org>
-
-	* Version 1.7-pre1 released.
+	* Version 1.7 released.
 	* Ported fast encoder and option '-0' from lzip.
 	* Makefile.in: Added new targets 'install*-compress'.
 
-- 
cgit v1.2.3