diff options
| author | Glenn Morris | 2014-11-04 21:08:57 -0800 |
|---|---|---|
| committer | Glenn Morris | 2014-11-04 21:08:57 -0800 |
| commit | b6e66a5cc78e353ff9ae6cdd0807eefcf55b4934 (patch) | |
| tree | c7562d5cde06977fc2eb14a7c0b6972738696386 /lisp/erc/ChangeLog | |
| parent | ddce73d32fa3e62e022842e3bbdc0aa83bb358cc (diff) | |
| parent | 58064b4da2835acb24d0f68021c84102e0fb1c0f (diff) | |
| download | emacs-b6e66a5cc78e353ff9ae6cdd0807eefcf55b4934.tar.gz emacs-b6e66a5cc78e353ff9ae6cdd0807eefcf55b4934.zip | |
Merge from emacs-24; up to 117669
Diffstat (limited to 'lisp/erc/ChangeLog')
| -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 75a01581fcd..0875994e775 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-11-05 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * erc.el (erc-send-input): Bind `str' dynamically (bug#18936). | ||
| 4 | |||
| 1 | 2014-10-29 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2014-10-29 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | Simplify use of current-time and friends. | 7 | Simplify use of current-time and friends. |