summaryrefslogtreecommitdiff
path: root/lisp/erc/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/erc/ChangeLog')
-rw-r--r--lisp/erc/ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index c12f289ce0f..efa3219db07 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2014-10-20 Glenn Morris <rgm@gnu.org>
+
+ * Merge in all changes up to 24.4 release.
+
2014-10-15 Ivan Shmakov <ivan@siamics.net>
* erc-track.el (erc-modified-channels-display): Update mode line