Mercurial > emacs
diff admin/ChangeLog @ 82140:b98604865ea0
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
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 26 Jul 2007 05:28:10 +0000 |
| parents | 7edf1ae10375 f8afb8b4b37a |
| children | 5d3c63b56aef f55f9811f5d7 |
line wrap: on
line diff
--- a/admin/ChangeLog Thu Jul 26 05:25:19 2007 +0000 +++ b/admin/ChangeLog Thu Jul 26 05:28:10 2007 +0000 @@ -1,3 +1,7 @@ +2007-07-25 Glenn Morris <rgm@gnu.org> + + * Relicense all FSF files to GPLv3 or later. + 2007-06-07 Glenn Morris <rgm@gnu.org> * admin.el (set-copyright): New function. @@ -433,7 +437,7 @@ GNU Emacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) + the Free Software Foundation; either version 3, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful,