aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/erc
diff options
context:
space:
mode:
authorGlenn Morris2015-01-30 00:01:24 -0800
committerGlenn Morris2015-01-30 00:01:24 -0800
commit2b9b98bdb70faf47405620fce9e5b5981a271d7c (patch)
tree255e2c482e6587acb647b57e1ffce6703a748d09 /lisp/erc
parent44ae1364908f91d877a6afa9bdd394e31fbd8311 (diff)
downloademacs-2b9b98bdb70faf47405620fce9e5b5981a271d7c.tar.gz
emacs-2b9b98bdb70faf47405620fce9e5b5981a271d7c.zip
# ChangeLog fixes
Merged ChangeLog entries go to the top, with the date of the merge. It's a simple rule.
Diffstat (limited to 'lisp/erc')
-rw-r--r--lisp/erc/ChangeLog4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index ba5d57e4d2e..44971cc16fc 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,7 +1,7 @@
12015-01-14 Dima Kogan <dima@secretsauce.net> 12015-01-28 Dima Kogan <dima@secretsauce.net>
2 2
3 * erc-backend.el (define-erc-response-handler): Give hook-name 3 * erc-backend.el (define-erc-response-handler): Give hook-name
4 default value of nil and add-to-list (bug#19363) 4 default value of nil and add-to-list (bug#19363).
5 5
62015-01-22 Paul Eggert <eggert@cs.ucla.edu> 62015-01-22 Paul Eggert <eggert@cs.ucla.edu>
7 7