diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:02:47 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:02:47 -0800 |
| commit | bbb683f04aa0960422b12af5ef79679344fac19c (patch) | |
| tree | 2ce695d1512d61e55318d1d2ad775b3c0073b4f7 /lisp/desktop.el | |
| parent | 9bec2fb3c19968a673f761c55057c4dbc9d907be (diff) | |
| parent | ce5538248e29ba2e4db531192a92e7c334de92da (diff) | |
| download | emacs-bbb683f04aa0960422b12af5ef79679344fac19c.tar.gz | |
; Merge from origin/emacs-25
The following commit was skipped:
ce55382 ; Auto-commit of loaddefs file.
Diffstat (limited to 'lisp/desktop.el')
0 files changed, 0 insertions, 0 deletions