Mercurial > emacs
comparison src/ChangeLog.1 @ 90996:f55f9811f5d7
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 824-831)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 70-74)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-238
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 27 Jul 2007 10:52:18 +0000 |
parents | 52a7f3f50b89 922696f363b0 |
children | 606f2d163a64 |
comparison
equal
deleted
inserted
replaced
90995:9a391d85a79f | 90996:f55f9811f5d7 |
---|---|
3526 | 3526 |
3527 This file is part of GNU Emacs. | 3527 This file is part of GNU Emacs. |
3528 | 3528 |
3529 GNU Emacs is free software; you can redistribute it and/or modify | 3529 GNU Emacs is free software; you can redistribute it and/or modify |
3530 it under the terms of the GNU General Public License as published by | 3530 it under the terms of the GNU General Public License as published by |
3531 the Free Software Foundation; either version 2, or (at your option) | 3531 the Free Software Foundation; either version 3, or (at your option) |
3532 any later version. | 3532 any later version. |
3533 | 3533 |
3534 GNU Emacs is distributed in the hope that it will be useful, | 3534 GNU Emacs is distributed in the hope that it will be useful, |
3535 but WITHOUT ANY WARRANTY; without even the implied warranty of | 3535 but WITHOUT ANY WARRANTY; without even the implied warranty of |
3536 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 3536 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |