aboutsummaryrefslogtreecommitdiffstats
path: root/admin/ChangeLog
diff options
context:
space:
mode:
authorJoakim Verona2013-08-27 19:32:10 +0200
committerJoakim Verona2013-08-27 19:32:10 +0200
commitebc2ba4f6049d17fd41d2f1fc8d65efe309f6bf4 (patch)
treef2e7b583160ca1f9735006d6304e5d7f479498e3 /admin/ChangeLog
parent9d6363e6a7ca3d8c89d8e1e92500793a56e749e6 (diff)
parent278208b8e6917af1e7e2623a3869614fa70059ed (diff)
downloademacs-ebc2ba4f6049d17fd41d2f1fc8d65efe309f6bf4.tar.gz
emacs-ebc2ba4f6049d17fd41d2f1fc8d65efe309f6bf4.zip
merge from trunk
Diffstat (limited to 'admin/ChangeLog')
-rw-r--r--admin/ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index f92fa8930b5..245c809ec81 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,7 +1,7 @@
12013-08-27 Glenn Morris <rgm@gnu.org> 12013-08-27 Glenn Morris <rgm@gnu.org>
2 2
3 * admin.el (manual-misc-manuals): Use INFO_COMMON rather than 3 * admin.el (manual-misc-manuals): Use INFO_COMMON rather than
4 INFO_TARGETS. 4 INFO_TARGETS. "faq" does not need special treatment any more.
5 5
62013-08-15 Glenn Morris <rgm@gnu.org> 62013-08-15 Glenn Morris <rgm@gnu.org>
7 7