diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-23 10:14:19 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-23 10:15:22 -0700 |
| commit | 325c5543035b411ae79839dda47bbbbde838d36b (patch) | |
| tree | 106628eb812555c6fdbe7e93767c30b71b1b3e22 /lisp/emacs-lisp/generator.el | |
| parent | bfed046df118533fc599449d48e59a3100e6439d (diff) | |
| parent | e72edc05c3277fbf57a94daaa792635bfede7bc0 (diff) | |
| download | emacs-325c5543035b411ae79839dda47bbbbde838d36b.tar.gz emacs-325c5543035b411ae79839dda47bbbbde838d36b.tar.bz2 emacs-325c5543035b411ae79839dda47bbbbde838d36b.zip | |
Merge from origin/emacs-24
e72edc0 Fix lisp/ChangeLog entry from last commit.
Conflicts:
lisp/ChangeLog
Diffstat (limited to 'lisp/emacs-lisp/generator.el')
0 files changed, 0 insertions, 0 deletions