]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1829a1f 71b20b3)
; Merge from origin/emacs-25
authorJohn Wiegley <johnw@newartisans.com>
Thu, 4 Feb 2016 07:54:58 +0000 (23:54 -0800)
committerJohn Wiegley <johnw@newartisans.com>
Thu, 4 Feb 2016 07:54:58 +0000 (23:54 -0800)
The following commit was skipped:

71b20b3 Backport: * lisp/files.el: Remove support for extra .dir-locals file


Trivial merge