aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorAlan Mackenzie2012-01-15 19:34:11 +0000
committerAlan Mackenzie2012-01-15 19:34:11 +0000
commit44b0225ed09cfbc6cee7ed53c630988c342df806 (patch)
treec2e9c9eb79d76db50179d0be46da54a82b751033 /admin
parentb493658e2c67e9ae41798edefd7cb9a264e53e99 (diff)
parent97912defd376ad75ac582d073851a5a7a4d3cc12 (diff)
downloademacs-44b0225ed09cfbc6cee7ed53c630988c342df806.tar.gz
emacs-44b0225ed09cfbc6cee7ed53c630988c342df806.zip
Merge.
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog5
-rw-r--r--admin/FOR-RELEASE8
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 @@
12012-01-14 Eli Zaretskii <eliz@gnu.org>
2
3 * FOR-RELEASE (Check the Emacs Tutorial): Mark TUTORIAL.he as
4 updated and checked.
5
12011-11-26 Andreas Schwab <schwab@linux-m68k.org> 62011-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
107TUTORIAL.eo 107TUTORIAL.eo
108TUTORIAL.es 108TUTORIAL.es
109TUTORIAL.fr 109TUTORIAL.fr
110TUTORIAL.he 110TUTORIAL.he eliz
111TUTORIAL.it 111TUTORIAL.it
112TUTORIAL.ja 112TUTORIAL.ja
113TUTORIAL.ko 113TUTORIAL.ko
@@ -133,7 +133,7 @@ buffers.texi cyd
133building.texi cyd 133building.texi cyd
134calendar.texi 134calendar.texi
135cal-xtra.texi 135cal-xtra.texi
136cmdargs.texi 136cmdargs.texi cyd
137commands.texi cyd 137commands.texi cyd
138custom.texi cyd 138custom.texi cyd
139dired.texi cyd 139dired.texi cyd
@@ -144,7 +144,7 @@ emacs-xtra.texi
144emerge-xtra.texi 144emerge-xtra.texi
145entering.texi cyd 145entering.texi cyd
146files.texi cyd 146files.texi cyd
147fixit.texi 147fixit.texi cyd
148fortran-xtra.texi 148fortran-xtra.texi
149frames.texi cyd 149frames.texi cyd
150glossary.texi 150glossary.texi
@@ -175,7 +175,7 @@ trouble.texi cyd
175vc-xtra.texi cyd 175vc-xtra.texi cyd
176vc1-xtra.texi cyd 176vc1-xtra.texi cyd
177windows.texi cyd 177windows.texi cyd
178xresources.texi 178xresources.texi cyd
179 179
180** Check the Lisp manual. 180** Check the Lisp manual.
181 181