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 /etc/compilation.txt | |
| parent | 9ee365d565205366d61d9b50dd2a15ef903be983 (diff) | |
| parent | ef2805c29bb03f0c8c0d4b37a65f511123dcab1c (diff) | |
| download | emacs-9aecacd08a93bffb529cee59d74477890ce96f37.tar.gz | |
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 'etc/compilation.txt')
| -rw-r--r-- | etc/compilation.txt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/etc/compilation.txt b/etc/compilation.txt index 4b8990d5e39..2b30b17abdc 100644 --- a/etc/compilation.txt +++ b/etc/compilation.txt @@ -414,8 +414,8 @@ COPYING PERMISSIONS: This document 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 of the License, or - (at your option) any later version. + the Free Software Foundation; either version 3, or (at your option) + any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -423,5 +423,6 @@ COPYING PERMISSIONS: GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + along with this program; see the file COPYING. If not, write to + the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + Boston, MA 02110-1301 USA. |