]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fdc2da4 1ef309f)
; Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 9 Feb 2016 22:23:09 +0000 (14:23 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 9 Feb 2016 22:23:09 +0000 (14:23 -0800)
The following commit was skipped:

1ef309f Restore window conf in nsm


Trivial merge