summaryrefslogtreecommitdiff
path: root/etc/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-08-27 18:59:29 -0700
committerGlenn Morris <rgm@gnu.org>2014-08-27 18:59:29 -0700
commit6d26235315194737c4dc8653cf6d05177a10fa9c (patch)
tree4a80f49f2073d80610931dd8706e90527a98340b /etc/ChangeLog
parent93b31b57283d369fefc5c95082d7b09288f05128 (diff)
parentb62da77c1c94b393f8be7854ff1cb30b012aa238 (diff)
downloademacs-6d26235315194737c4dc8653cf6d05177a10fa9c.tar.gz
Merge from emacs-24; up to 2014-07-02T00:57:53Z!juri@jurta.org
Diffstat (limited to 'etc/ChangeLog')
-rw-r--r--etc/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 72c8334d3df..4a79ec47a4b 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-28 Glenn Morris <rgm@gnu.org>
+
+ * emacs.appdata.xml: New file; description from Emacs's homepage.
+
2014-08-25 Eli Zaretskii <eliz@gnu.org>
* NEWS: Mention that string-collate-* functions are supported on