diff options
| author | Joakim Verona | 2013-08-13 09:37:29 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-13 09:37:29 +0200 |
| commit | 7f502f7b6fc418af15408709cad4dc3dda8db583 (patch) | |
| tree | 99acc176696926381f261434c067c2afa7bd5bdd /lisp/ChangeLog | |
| parent | 0b4c71fb6ca9382bee1dfa6996b7a5d67f469880 (diff) | |
| parent | ae3f0661b3baf53dec77c14b9b54530094f09904 (diff) | |
| download | emacs-7f502f7b6fc418af15408709cad4dc3dda8db583.tar.gz emacs-7f502f7b6fc418af15408709cad4dc3dda8db583.zip | |
merge from trunk
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0c0c3911cfd..7951188bbaf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-08-13 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * net/shr.el (shr-table-horizontal-line): Fix custom type. | ||
| 4 | |||
| 1 | 2013-08-13 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2013-08-13 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * emacs-lisp/timer.el (timer--time-setter): New function. | 7 | * emacs-lisp/timer.el (timer--time-setter): New function. |