| commit | 325c5543035b411ae79839dda47bbbbde838d36b | |
| author | Paul Eggert <eggert@cs.ucla.edu> | |
| Mon, 23 Mar 2015 17:14:19 +0000 (23 10:14 -0700) | ||
| committer | Paul Eggert <eggert@cs.ucla.edu> | |
| Mon, 23 Mar 2015 17:15:22 +0000 (23 10:15 -0700) | ||
| tree | 106628eb812555c6fdbe7e93767c30b71b1b3e22 | treesnapshot (tar.gz zip) |
| parent | bfed046df118533fc599449d48e59a3100e6439d | commitdiff |
| parent | e72edc05c3277fbf57a94daaa792635bfede7bc0 | commitdiff |
Merge from origin/emacs-24
e72edc0 Fix lisp/ChangeLog entry from last commit.
Conflicts:
lisp/ChangeLog
e72edc0 Fix lisp/ChangeLog entry from last commit.
Conflicts:
lisp/ChangeLog