]> code.delx.au - gnu-emacs/commitdiff
Merge from origin/emacs-25
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 26 May 2016 19:41:38 +0000 (12:41 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 26 May 2016 19:41:38 +0000 (12:41 -0700)
06cb28f Fix bug#23462: Crash when iconifying frame on OS X.

1  2 
src/nsterm.m

diff --cc src/nsterm.m
Simple merge