]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c558890 124c486)
; Merge from origin/emacs-25
authorJohn Wiegley <johnw@newartisans.com>
Sat, 2 Apr 2016 21:51:33 +0000 (14:51 -0700)
committerJohn Wiegley <johnw@newartisans.com>
Sat, 2 Apr 2016 21:51:33 +0000 (14:51 -0700)
The following commit was skipped:

124c486 Remove prog-indentation-context


Trivial merge