diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-30 11:41:07 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-30 11:41:07 -0800 |
commit | e6d575316a42946aac6d83c9587f09afd1a59d98 (patch) | |
tree | 730b07f317a18596dba60ac473d40069b6d1c1cf /lisp/files.el | |
parent | 9304e6d3a222de6ef1c405bfd6e09eee6ed2c2aa (diff) | |
parent | fef1b3066ae02ec6dd37b0358905491fabbedfdf (diff) | |
download | emacs-e6d575316a42946aac6d83c9587f09afd1a59d98.tar.gz emacs-e6d575316a42946aac6d83c9587f09afd1a59d98.tar.bz2 emacs-e6d575316a42946aac6d83c9587f09afd1a59d98.zip |
; Merge from origin/emacs-25
The following commit was skipped:
fef1b30 Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25
Diffstat (limited to 'lisp/files.el')
0 files changed, 0 insertions, 0 deletions