aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorAlan Mackenzie2012-01-18 11:50:27 +0000
committerAlan Mackenzie2012-01-18 11:50:27 +0000
commite8afb1265f8067d360f03c514603223cde92ffeb (patch)
tree94797628f6e0a13874730f266fe5de3a0ee90ac9 /admin
parent44b0225ed09cfbc6cee7ed53c630988c342df806 (diff)
parent3fcca64dce0c0e9f6c6fc55f19ce47fe9e861352 (diff)
downloademacs-e8afb1265f8067d360f03c514603223cde92ffeb.tar.gz
emacs-e8afb1265f8067d360f03c514603223cde92ffeb.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 daf8e33d041..6b10d51b970 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -117,7 +117,7 @@ TUTORIAL.pt_BR
117TUTORIAL.ro 117TUTORIAL.ro
118TUTORIAL.ru 118TUTORIAL.ru
119TUTORIAL.sk 119TUTORIAL.sk
120TUTORIAL.sl 120TUTORIAL.sl Primoz PETERLIN
121TUTORIAL.sv 121TUTORIAL.sv
122TUTORIAL.th 122TUTORIAL.th
123TUTORIAL.zh 123TUTORIAL.zh
@@ -203,7 +203,7 @@ help.texi
203hooks.texi 203hooks.texi
204index.texi 204index.texi
205internals.texi 205internals.texi
206intro.texi 206intro.texi cyd
207keymaps.texi 207keymaps.texi
208lists.texi 208lists.texi
209loading.texi 209loading.texi