]> git.eshelyaron.com Git - emacs.git/commit
; 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)
commit44f853c4acda0634a3541116834c3e768bef650d
tree0c4c996897292cec2115b21f40db68836af0190e
parentfdc2da4ef44b32e2dd360defc9bd64d644ed1783
parent1ef309fc88368f0ff51865be94ef4a8efd01f3fe
; Merge from origin/emacs-25

The following commit was skipped:

1ef309f Restore window conf in nsm