]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fb9d07 38698b6)
; Merge from origin/emacs-25
authorJohn Wiegley <johnw@newartisans.com>
Fri, 4 Mar 2016 07:53:27 +0000 (23:53 -0800)
committerJohn Wiegley <johnw@newartisans.com>
Fri, 4 Mar 2016 07:53:27 +0000 (23:53 -0800)
The following commit was skipped:

38698b6 ; * lisp/vc/vc-hooks.el: corrected docstring of face


Trivial merge