Merging upstream version 1.0.

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

1 files changed, 12 insertions, 37 deletions

diff --git a/ChangeLog b/ChangeLog
index 9445e68..7140457 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,46 +1,21 @@
-2013-04-08  Antonio Diaz Diaz  <ant_diaz@teleline.es>
+2013-05-31  Antonio Diaz Diaz  <antonio@gnu.org>
 
-	* Version 1.0-rc7 released.
+	* Version 1.0 released.
+	* Added new option '--format' to all utilities.
+	* main.cc (main): Make 'grep_show_name' tri-state so that file
+	  name is no prefixed to output by default when searching one
+	  file and '--recursive' has not been selected.
 	* Zgrep: Fixed output of option '-L' (it behaved like '-l').
-
-2013-03-15  Antonio Diaz Diaz  <ant_diaz@teleline.es>
-
-	* Version 1.0-rc6 released.
+	* zcmp.cc: Fixed deadlock when '-n' option is used.
 	* zdiff.cc (set_data_feeder): Call decompressor with option "-q"
 	  only if verbosity < 0.
 	* zutils.cc (set_data_feeder): Likewise.
-
-2013-02-21  Antonio Diaz Diaz  <ant_diaz@teleline.es>
-
-	* Version 1.0-rc5 released.
-	* main.cc (main): Zgrep now shows file names by default when
-	  '--recursive' is selected.
-	* zcmp.cc: Fixed deadlock when '-n' option is used.
-	* main.cc: Use 'setmode' instead of '_setmode' on Windows and OS/2.
-
-2012-12-04  Antonio Diaz Diaz  <ant_diaz@teleline.es>
-
-	* Version 1.0-rc4 released.
-	* main.cc (main): Make 'grep_show_name' tri-state so that file name
-	  is no prefixed to output by default when searching one file.
-	* zcat.cc (Line_number): Fixed a portability issue with Solaris 9.
-
-2012-10-26  Antonio Diaz Diaz  <ant_diaz@teleline.es>
-
-	* Version 1.0-rc3 released.
-	* Added new option '--format' to all utilities.
-	* Makefile.in: Added new target 'install-bin'.
-
-2012-04-30  Antonio Diaz Diaz  <ant_diaz@teleline.es>
-
-	* Version 1.0-rc2 released.
-	* Minor fixes.
-	* configure: 'datadir' renamed to 'datarootdir'.
-
-2012-01-18  Antonio Diaz Diaz  <ant_diaz@teleline.es>
-
-	* Version 1.0-rc1 released.
 	* Changed quote characters in messages as advised by GNU Standards.
+	* configure: Options now accept a separate argument.
+	* configure: 'datadir' renamed to 'datarootdir'.
+	* Makefile.in: Added new target 'install-bin'.
+	* Use 'setmode' instead of '_setmode' on Windows and OS/2.
+	* zcat.cc (Line_number): Fixed a portability issue with Solaris 9.
 	* INSTALL: Document installing zutils along with GNU gzip.
 
 2011-01-11  Antonio Diaz Diaz  <ant_diaz@teleline.es>