summaryrefslogtreecommitdiff
path: root/lisp/org/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/org/ChangeLog')
-rw-r--r--lisp/org/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 3910a71db3f..1d71497600e 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <rgm@gnu.org>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-12 Marco Wahl <marcowahlsoft@gmail.com>
* org-agenda.el (org-get-entries-from-diary): Use