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/buffer.c | |
| 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/buffer.c')
| -rw-r--r-- | src/buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c index b401ce97e48..0f38851e9eb 100644 --- a/src/buffer.c +++ b/src/buffer.c | |||
| @@ -7,7 +7,7 @@ This file is part of GNU Emacs. | |||
| 7 | 7 | ||
| 8 | GNU Emacs is free software; you can redistribute it and/or modify | 8 | GNU Emacs is free software; you can redistribute it and/or modify |
| 9 | it under the terms of the GNU General Public License as published by | 9 | it under the terms of the GNU General Public License as published by |
| 10 | the Free Software Foundation; either version 2, or (at your option) | 10 | the Free Software Foundation; either version 3, or (at your option) |
| 11 | any later version. | 11 | any later version. |
| 12 | 12 | ||
| 13 | GNU Emacs is distributed in the hope that it will be useful, | 13 | GNU Emacs is distributed in the hope that it will be useful, |