diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-23 10:17:43 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-23 10:17:43 -0700 |
| commit | 7f55d4251806e4712762bef0a3ed41a53f850a58 (patch) | |
| tree | 789eea5ae877ce84973daefbb1a7d9256297c75e /lisp/emacs-lisp | |
| parent | a660037698bce151915e6e084593071134df1331 (diff) | |
| parent | a4ff05a2172fc0c057ca9715d263c8b00fbf0218 (diff) | |
| download | emacs-7f55d4251806e4712762bef0a3ed41a53f850a58.tar.gz | |
Merge from origin/emacs-24
The following commit was skipped:
a4ff05a ChangeLog fix No need to merge to trunk, since it corrects a backported entry that should not appear in trunk.
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions