diff options
| author | Alan Mackenzie | 2012-01-15 19:34:11 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2012-01-15 19:34:11 +0000 |
| commit | 44b0225ed09cfbc6cee7ed53c630988c342df806 (patch) | |
| tree | c2e9c9eb79d76db50179d0be46da54a82b751033 /admin | |
| parent | b493658e2c67e9ae41798edefd7cb9a264e53e99 (diff) | |
| parent | 97912defd376ad75ac582d073851a5a7a4d3cc12 (diff) | |
| download | emacs-44b0225ed09cfbc6cee7ed53c630988c342df806.tar.gz emacs-44b0225ed09cfbc6cee7ed53c630988c342df806.zip | |
Merge.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 5 | ||||
| -rw-r--r-- | admin/FOR-RELEASE | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 3bfbab881aa..597beb60ce2 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-01-14 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * FOR-RELEASE (Check the Emacs Tutorial): Mark TUTORIAL.he as | ||
| 4 | updated and checked. | ||
| 5 | |||
| 1 | 2011-11-26 Andreas Schwab <schwab@linux-m68k.org> | 6 | 2011-11-26 Andreas Schwab <schwab@linux-m68k.org> |
| 2 | 7 | ||
| 3 | * grammars/bovine-grammar.el (bovine--grammar-newstyle-unquote): | 8 | * grammars/bovine-grammar.el (bovine--grammar-newstyle-unquote): |
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index c82dbf36f0d..daf8e33d041 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE | |||
| @@ -107,7 +107,7 @@ TUTORIAL.de | |||
| 107 | TUTORIAL.eo | 107 | TUTORIAL.eo |
| 108 | TUTORIAL.es | 108 | TUTORIAL.es |
| 109 | TUTORIAL.fr | 109 | TUTORIAL.fr |
| 110 | TUTORIAL.he | 110 | TUTORIAL.he eliz |
| 111 | TUTORIAL.it | 111 | TUTORIAL.it |
| 112 | TUTORIAL.ja | 112 | TUTORIAL.ja |
| 113 | TUTORIAL.ko | 113 | TUTORIAL.ko |
| @@ -133,7 +133,7 @@ buffers.texi cyd | |||
| 133 | building.texi cyd | 133 | building.texi cyd |
| 134 | calendar.texi | 134 | calendar.texi |
| 135 | cal-xtra.texi | 135 | cal-xtra.texi |
| 136 | cmdargs.texi | 136 | cmdargs.texi cyd |
| 137 | commands.texi cyd | 137 | commands.texi cyd |
| 138 | custom.texi cyd | 138 | custom.texi cyd |
| 139 | dired.texi cyd | 139 | dired.texi cyd |
| @@ -144,7 +144,7 @@ emacs-xtra.texi | |||
| 144 | emerge-xtra.texi | 144 | emerge-xtra.texi |
| 145 | entering.texi cyd | 145 | entering.texi cyd |
| 146 | files.texi cyd | 146 | files.texi cyd |
| 147 | fixit.texi | 147 | fixit.texi cyd |
| 148 | fortran-xtra.texi | 148 | fortran-xtra.texi |
| 149 | frames.texi cyd | 149 | frames.texi cyd |
| 150 | glossary.texi | 150 | glossary.texi |
| @@ -175,7 +175,7 @@ trouble.texi cyd | |||
| 175 | vc-xtra.texi cyd | 175 | vc-xtra.texi cyd |
| 176 | vc1-xtra.texi cyd | 176 | vc1-xtra.texi cyd |
| 177 | windows.texi cyd | 177 | windows.texi cyd |
| 178 | xresources.texi | 178 | xresources.texi cyd |
| 179 | 179 | ||
| 180 | ** Check the Lisp manual. | 180 | ** Check the Lisp manual. |
| 181 | 181 | ||