]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fd4fc00 dfe1650)
; Merge from origin/emacs-25
authorJohn Wiegley <johnw@newartisans.com>
Fri, 4 Mar 2016 07:52:26 +0000 (23:52 -0800)
committerJohn Wiegley <johnw@newartisans.com>
Fri, 4 Mar 2016 07:52:26 +0000 (23:52 -0800)
The following commits were skipped:

dfe1650 (ls-lisp-insert-directory): Make -B work
42bc065 Make buttons in header lines work


Trivial merge