Mercurial > emacs
diff lisp/erc/ChangeLog @ 110997:b8fde5ef9e14
Merge changes from emacs-23 branch.
| author | Juanma Barranquero <lekktu@gmail.com> |
|---|---|
| date | Thu, 14 Oct 2010 16:32:27 +0200 |
| parents | de51e19494d6 cda2045a5ee8 |
| children | bf6806de6892 |
line wrap: on
line diff
--- a/lisp/erc/ChangeLog Thu Oct 14 13:55:30 2010 +0000 +++ b/lisp/erc/ChangeLog Thu Oct 14 16:32:27 2010 +0200 @@ -1,3 +1,7 @@ +2010-10-14 Juanma Barranquero <lekktu@gmail.com> + + * erc-xdcc.el (erc-xdcc-help-text): Fix typo in docstring. + 2010-10-10 Dan Nicolaescu <dann@ics.uci.edu> * erc-list.el (erc-list-menu-mode-map): Declare and define in one step.