]> code.delx.au - gnu-emacs/commit
; 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)
commit91ab66201cedbcd2e4e8533a7152f6736ad08731
treee2ea31dde9caa974a251a5e943e8eb0588801dd9
parent1829a1fc85b040912dc194806c64670096ddcf43
parent71b20b31c8ee25bcd0de1a954c9ca7b49140b3b2
; Merge from origin/emacs-25

The following commit was skipped:

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