aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorChong Yidong2012-04-27 11:10:38 +0800
committerChong Yidong2012-04-27 11:10:38 +0800
commita8e7d6d783219972c08fd49a3a2afaf26eb139c2 (patch)
tree5e86d23d9285389791dc8321d8a8a2ece2247bea /admin
parentb360839071ef6c7a9e917fe57a4aaeb39138e8c0 (diff)
parentc5bb756916baa63cc663d68d4c24e5ad33a764e8 (diff)
downloademacs-a8e7d6d783219972c08fd49a3a2afaf26eb139c2.tar.gz
emacs-a8e7d6d783219972c08fd49a3a2afaf26eb139c2.zip
Merge changes from emacs-24 branch
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 ad427397524..f53b74e98c4 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -61,7 +61,7 @@ sk Miroslav Vaško
61 61
62** Consider bumping customize-changed-options-previous-release. 62** Consider bumping customize-changed-options-previous-release.
63 63
64** cusver-check from admin.el cam help find new defcustoms missing 64** cusver-check from admin.el can help find new defcustoms missing
65:version tags. 65:version tags.
66 66
67* BUGS 67* BUGS
@@ -229,7 +229,7 @@ syntax.texi cyd
229text.texi cyd 229text.texi cyd
230tips.texi rgm 230tips.texi rgm
231variables.texi cyd 231variables.texi cyd
232windows.texi 232windows.texi rgm (skimmed)
233 233
234 234
235Local variables: 235Local variables: