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