summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorTony Abou-Assaleh <taa@acm.org>2007-10-10 04:29:47 +0000
committerTony Abou-Assaleh <taa@acm.org>2007-10-10 04:29:47 +0000
commitecf2d276aec49d96ce9973a0f05aadcc39f25274 (patch)
tree598d23a7b73bd1a5bb854f7de6b73e8f5b0270b2 /ChangeLog
parentb979431adaf327fc87fd65254d539fc134a5c8b2 (diff)
downloadgrep-ecf2d276aec49d96ce9973a0f05aadcc39f25274.tar.gz
* Re-commit changes of 2007-10-07
* configure.ac.in: update version to 2.6-dev * src/grep.c: update --version message * configure.ac.in: update version to 2.6-dev * src/grep.c: update --version message * src/grep.c: When -h and -H are combined, use the last specified, Bug #15620, Patch #4866 * tests/foad1.sh: add tests for -h and -H * ChangeLog: Add a copyright notice (years taken from commit logs), add a license notice (taken from gnulib ChangeLog) * TODO: update the link to a list of other grep implementations
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog22
1 files changed, 22 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d2ddb692..183949fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2007-10-10 Tony Abou-Assaleh <taa@acm.org>
+
+ * configure.ac.in: update version to 2.6-dev
+
+ * src/grep.c: update --version message
+
+2007-10-07 Tony Abou-Assaleh <taa@acm.org>
+
+ * src/grep.c: When -h and -H are combined, use the last specified,
+ Bug #15620, Patch #4866
+ * tests/foad1.sh: add tests for -h and -H
+
+ * ChangeLog: Add a copyright notice (years taken from commit logs),
+ add a license notice (taken from gnulib ChangeLog)
+
+ * TODO: update the link to a list of other grep implementations
+
2007-06-29 Bernhard Rosenkraenzer <bero@arklinux.org>
* all files: GPLv3
@@ -3217,3 +3234,8 @@ axes.)
1993-05-22 Mike Haertel <mike@cs.uoregon.edu>
* Version 2.0 released.
+
+Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ Free Software Foundation, Inc.
+Copying and distribution of this file, with or without modification,
+ are permitted provided the copyright notice and this notice are preserved.