From a499cf9dc12d64786b662483847c5eca56f78aca Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Sat, 7 Nov 2015 15:47:04 +0100
Subject: Merging upstream version 1.4~rc2.

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 9214436..7d397bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-15  Antonio Diaz Diaz  <ant_diaz@teleline.es>
+
+	* Version 1.4-rc2 released.
+	* Fixed return value of '-d' and '-t' in case of data error.
+	* main.c: Changed info shown at verbosity levels 2 and 3.
+	* Ignore option '-n, --threads' for compatibility with plzip.
+
 2013-02-18  Antonio Diaz Diaz  <ant_diaz@teleline.es>
 
 	* Version 1.4-rc1 released.
-- 
cgit v1.2.3