Mercurial > emacs
comparison src/composite.c @ 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 | 3619e7770f2e b98604865ea0 |
| children | 17bc979cf2b7 |
comparison
equal
deleted
inserted
replaced
| 90995:9a391d85a79f | 90996:f55f9811f5d7 |
|---|---|
| 10 | 10 |
| 11 This file is part of GNU Emacs. | 11 This file is part of GNU Emacs. |
| 12 | 12 |
| 13 GNU Emacs is free software; you can redistribute it and/or modify | 13 GNU Emacs is free software; you can redistribute it and/or modify |
| 14 it under the terms of the GNU General Public License as published by | 14 it under the terms of the GNU General Public License as published by |
| 15 the Free Software Foundation; either version 2, or (at your option) | 15 the Free Software Foundation; either version 3, or (at your option) |
| 16 any later version. | 16 any later version. |
| 17 | 17 |
| 18 GNU Emacs is distributed in the hope that it will be useful, | 18 GNU Emacs is distributed in the hope that it will be useful, |
| 19 but WITHOUT ANY WARRANTY; without even the implied warranty of | 19 but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 20 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 20 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |