diff options
| author | Miles Bader | 2007-07-26 05:28:10 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-07-26 05:28:10 +0000 |
| commit | 9aecacd08a93bffb529cee59d74477890ce96f37 (patch) | |
| tree | 149d4cef4deb6e93e300b6ef89322181a3d29ce4 /lisp/diff.el | |
| parent | 9ee365d565205366d61d9b50dd2a15ef903be983 (diff) | |
| parent | ef2805c29bb03f0c8c0d4b37a65f511123dcab1c (diff) | |
| download | emacs-9aecacd08a93bffb529cee59d74477890ce96f37.tar.gz emacs-9aecacd08a93bffb529cee59d74477890ce96f37.zip | |
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 70-73)
- Update from CVS
2007-07-25 Glenn Morris <rgm@gnu.org>
* Relicense all FSF files to GPLv3 or later.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
Diffstat (limited to 'lisp/diff.el')
| -rw-r--r-- | lisp/diff.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/diff.el b/lisp/diff.el index 7149ef0d150..3013f0d769e 100644 --- a/lisp/diff.el +++ b/lisp/diff.el | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | 10 | ||
| 11 | ;; GNU Emacs is free software; you can redistribute it and/or modify | 11 | ;; GNU Emacs is free software; you can redistribute it and/or modify |
| 12 | ;; it under the terms of the GNU General Public License as published by | 12 | ;; it under the terms of the GNU General Public License as published by |
| 13 | ;; the Free Software Foundation; either version 2, or (at your option) | 13 | ;; the Free Software Foundation; either version 3, or (at your option) |
| 14 | ;; any later version. | 14 | ;; any later version. |
| 15 | 15 | ||
| 16 | ;; GNU Emacs is distributed in the hope that it will be useful, | 16 | ;; GNU Emacs is distributed in the hope that it will be useful, |