diff options
| author | Miles Bader | 2007-07-27 10:52:18 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-07-27 10:52:18 +0000 |
| commit | e468b87f91f26e66a8cde087c1a9c89c67b96d12 (patch) | |
| tree | 7cf1ded30152bb0ddd4bbff544693a05b3b62911 /src/coding.h | |
| parent | b692c96bfa9b8bedd6e093a6c571624442db2e2a (diff) | |
| parent | 05bfa8f34f3eedec3ad2fdb45971476a8c8f49b1 (diff) | |
| download | emacs-e468b87f91f26e66a8cde087c1a9c89c67b96d12.tar.gz emacs-e468b87f91f26e66a8cde087c1a9c89c67b96d12.zip | |
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
Diffstat (limited to 'src/coding.h')
| -rw-r--r-- | src/coding.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/coding.h b/src/coding.h index f33e8335752..d4b159c3dfa 100644 --- a/src/coding.h +++ b/src/coding.h | |||
| @@ -13,7 +13,7 @@ This file is part of GNU Emacs. | |||
| 13 | 13 | ||
| 14 | GNU Emacs is free software; you can redistribute it and/or modify | 14 | GNU Emacs is free software; you can redistribute it and/or modify |
| 15 | it under the terms of the GNU General Public License as published by | 15 | it under the terms of the GNU General Public License as published by |
| 16 | the Free Software Foundation; either version 2, or (at your option) | 16 | the Free Software Foundation; either version 3, or (at your option) |
| 17 | any later version. | 17 | any later version. |
| 18 | 18 | ||
| 19 | GNU Emacs is distributed in the hope that it will be useful, | 19 | GNU Emacs is distributed in the hope that it will be useful, |