HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge from emacs-24; up to 2012-05-02T07:12:52Z!rgm@gnu.org.
[bpt/emacs.git]
/
etc
/
grep.txt
diff --git
a/etc/grep.txt
b/etc/grep.txt
index
01ffa9f
..
e9fea92
100644
(file)
--- a/
etc/grep.txt
+++ b/
etc/grep.txt
@@
-84,7
+84,7
@@
grep -nH -e "xyzxyz" ../info/*
\f
-Copyright (C) 2005-201
1
Free Software Foundation, Inc.
+Copyright (C) 2005-201
2
Free Software Foundation, Inc.
COPYING PERMISSIONS: