Merging upstream version 0.9~rc2.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 11 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 681e746..9105618 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,18 @@
+2010-12-05  Antonio Diaz Diaz  <ant_diaz@teleline.es>
+
+	* Version 0.9-rc2 released.
+	* zcmp.cc: Fixed deadlock when files differ.
+	* zgrep.cc: Fixed deadlock when binary file matches.
+
 2010-11-20  Antonio Diaz Diaz  <ant_diaz@teleline.es>
 
 	* Version 0.9-rc1 released.
-	* configure: Added new options "DIFF" and "GREP".
+	* configure: Added new options `DIFF' and `GREP'.
 
 2010-11-15  Antonio Diaz Diaz  <ant_diaz@teleline.es>
 
 	* Version 0.8 released.
-	* main.cc: Added new options "--zcat", "--zgrep" and "--ztest".
+	* main.cc: Added new options `--zcat', `--zgrep' and `--ztest'.
 	* zcat.cc: New file implementing zcat+cat functionality in C++.
 	* zcmp.cc: New file implementing zcmp+cmp functionality in C++.
 	* doc/zcmp.1: New file.
@@ -18,7 +24,7 @@
 	  documentation because egrep and fgrep are deprecated.
 	* ztest.cc: New file implementing ztest functionality in C++.
 	* Makefile.in: Added quotes to directory names.
-	* testsuite/check.sh: Use "test.txt" instead of "COPYING" for testing.
+	* testsuite/check.sh: Use `test.txt' instead of `COPYING' for testing.
 	* Removed environment safeguards from configure as requested by
 	  Richard Stallman. Now environment variables affect configure.
 
@@ -26,14 +32,14 @@
 
 	* Version 0.7 released.
 	* Added new utility; ztest.
-	* zcat.in: Added new option "--recursive".
+	* zcat.in: Added new option `--recursive'.
 
 2009-10-05  Antonio Diaz Diaz  <ant_diaz@teleline.es>
 
 	* Version 0.6 released.
 	* zcat.in, zgrep.in: Removed again default compressor. Format of
 	  data read from stdin is now automatically detected.
-	* Makefile.in: Added "--name" option to help2man invocation.
+	* Makefile.in: Added `--name' option to help2man invocation.
 
 2009-10-01  Antonio Diaz Diaz  <ant_diaz@teleline.es>