aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorPaul Eggert2012-01-16 19:43:00 -0800
committerPaul Eggert2012-01-16 19:43:00 -0800
commit78df1fb1d46d556bfc2698ca1802972b13613ba8 (patch)
tree114803047bb77b06e149d9218cd4540b9f287e65 /admin
parent807f82fcebc7d946baa23f1d29ff5b0cf336f08e (diff)
parent1b0880d5f1b478fe097aef8b702a5c7c70bd9f18 (diff)
downloademacs-78df1fb1d46d556bfc2698ca1802972b13613ba8.tar.gz
emacs-78df1fb1d46d556bfc2698ca1802972b13613ba8.zip
Merge from trunk.
Diffstat (limited to 'admin')
-rw-r--r--admin/FOR-RELEASE4
1 files changed, 2 insertions, 2 deletions
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 0c75181aa03..daf8e33d041 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -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