diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:02:46 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:02:46 -0800 |
commit | 37b01efe2041999963db839ddf5dc94698e1da61 (patch) | |
tree | 73e980746ddc55c4285d145769a94b2845cbfcdf /lisp/emacs-lisp/elp.el | |
parent | 4f7a90bf6ce831063d721324e712f8c38e85c678 (diff) | |
parent | dfc9f114c728c254c19173001c2a5b49207afb9c (diff) | |
download | emacs-37b01efe2041999963db839ddf5dc94698e1da61.tar.gz emacs-37b01efe2041999963db839ddf5dc94698e1da61.tar.bz2 emacs-37b01efe2041999963db839ddf5dc94698e1da61.zip |
; Merge from origin/emacs-25
The following commit was skipped:
dfc9f11 Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac...
Diffstat (limited to 'lisp/emacs-lisp/elp.el')
0 files changed, 0 insertions, 0 deletions