Mercurial > emacs
comparison CONTRIBUTE @ 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 | 42f5a52dbf4b |
| children | a9b80f99c836 |
comparison
equal
deleted
inserted
replaced
| 82139:fe7fdfee34ac | 82140:b98604865ea0 |
|---|---|
| 205 | 205 |
| 206 This file is part of GNU Emacs. | 206 This file is part of GNU Emacs. |
| 207 | 207 |
| 208 GNU Emacs is free software; you can redistribute it and/or modify | 208 GNU Emacs is free software; you can redistribute it and/or modify |
| 209 it under the terms of the GNU General Public License as published by | 209 it under the terms of the GNU General Public License as published by |
| 210 the Free Software Foundation; either version 2, or (at your option) | 210 the Free Software Foundation; either version 3, or (at your option) |
| 211 any later version. | 211 any later version. |
| 212 | 212 |
| 213 GNU Emacs is distributed in the hope that it will be useful, | 213 GNU Emacs is distributed in the hope that it will be useful, |
| 214 but WITHOUT ANY WARRANTY; without even the implied warranty of | 214 but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 215 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 215 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |