Mercurial > emacs
comparison lisp/ChangeLog.4 @ 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 | c0409ee15cee 9355f9b7bbff |
| children | 606f2d163a64 |
comparison
equal
deleted
inserted
replaced
| 90995:9a391d85a79f | 90996:f55f9811f5d7 |
|---|---|
| 8944 | 8944 |
| 8945 This file is part of GNU Emacs. | 8945 This file is part of GNU Emacs. |
| 8946 | 8946 |
| 8947 GNU Emacs is free software; you can redistribute it and/or modify | 8947 GNU Emacs is free software; you can redistribute it and/or modify |
| 8948 it under the terms of the GNU General Public License as published by | 8948 it under the terms of the GNU General Public License as published by |
| 8949 the Free Software Foundation; either version 2, or (at your option) | 8949 the Free Software Foundation; either version 3, or (at your option) |
| 8950 any later version. | 8950 any later version. |
| 8951 | 8951 |
| 8952 GNU Emacs is distributed in the hope that it will be useful, | 8952 GNU Emacs is distributed in the hope that it will be useful, |
| 8953 but WITHOUT ANY WARRANTY; without even the implied warranty of | 8953 but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 8954 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 8954 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |