diff options
author | Glenn Morris <rgm@gnu.org> | 2014-11-09 23:39:35 -0800 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2014-11-09 23:39:35 -0800 |
commit | c832df2ec2f6528bc35f69f9fd9a4b2e470d2ebe (patch) | |
tree | 98a77f1acdac589d1be95dea128af1af7e8dc286 /lisp/erc/ChangeLog | |
parent | eca1ea96559e04e18a62a61208d501c557dd4cab (diff) | |
parent | edfdb22f674312389ccf5d5e37efa4d3f1516994 (diff) | |
download | emacs-c832df2ec2f6528bc35f69f9fd9a4b2e470d2ebe.tar.gz |
Merge from emacs-24; up to 117698
Diffstat (limited to 'lisp/erc/ChangeLog')
-rw-r--r-- | lisp/erc/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 0875994e775..475b99edb93 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,8 @@ +2014-11-10 Kelvin White <kwhite@gnu.org> + + * erc-match.el, erc-join.el, erc-stamp.el, erc-backend.el, erc.el: + * erc-button.el: Update version to 24.5. + 2014-11-05 Stefan Monnier <monnier@iro.umontreal.ca> * erc.el (erc-send-input): Bind `str' dynamically (bug#18936). |