diff options
author | Miles Bader <miles@gnu.org> | 2007-07-26 05:28:10 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2007-07-26 05:28:10 +0000 |
commit | 9aecacd08a93bffb529cee59d74477890ce96f37 (patch) | |
tree | 149d4cef4deb6e93e300b6ef89322181a3d29ce4 /msdos/ChangeLog | |
parent | 9ee365d565205366d61d9b50dd2a15ef903be983 (diff) | |
parent | ef2805c29bb03f0c8c0d4b37a65f511123dcab1c (diff) |
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 'msdos/ChangeLog')
-rw-r--r-- | msdos/ChangeLog | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog index 4c7c136c187..0fd192b7722 100644 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@ -1,3 +1,9 @@ +2007-07-25 Glenn Morris <rgm@gnu.org> + + * Relicense all FSF files to GPLv3 or later. + + * COPYING: Switch to GPLv3. + 2007-06-02 Chong Yidong <cyd@stupidchicken.com> * Version 22.1 released. @@ -647,7 +653,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, |