diff options
| author | Glenn Morris | 2014-10-20 20:59:41 +0100 |
|---|---|---|
| committer | Glenn Morris | 2014-10-20 20:59:41 +0100 |
| commit | 8a85c254de2528be0f3ff154fa24df65e6557c1a (patch) | |
| tree | dfc704abfcaf816f3be832097805523536347a43 /lisp/erc | |
| parent | 9d9bcb5020987f07dd2b9ab994f8826c07182829 (diff) | |
| parent | d20b72d9fa987ea9a511c6bed909c09929dc78f8 (diff) | |
| download | emacs-8a85c254de2528be0f3ff154fa24df65e6557c1a.tar.gz emacs-8a85c254de2528be0f3ff154fa24df65e6557c1a.zip | |
Merge from emacs-24; up to 2014-07-28T06:28:15Z!dmantipov@yandex.ru
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/ChangeLog | 4 |
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 @@ | |||
| 1 | 2014-10-20 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Merge in all changes up to 24.4 release. | ||
| 4 | |||
| 1 | 2014-10-15 Ivan Shmakov <ivan@siamics.net> | 5 | 2014-10-15 Ivan Shmakov <ivan@siamics.net> |
| 2 | 6 | ||
| 3 | * erc-track.el (erc-modified-channels-display): Update mode line | 7 | * erc-track.el (erc-modified-channels-display): Update mode line |