]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Mon, 4 Jun 2018 16:25:22 +0000 (09:25 -0700)
committerGlenn Morris <rgm@gnu.org>
Mon, 4 Jun 2018 16:25:22 +0000 (09:25 -0700)
defd53a Set accessibility subroles for child frame (bug#31324)
de6a876 Fix redefinition of child frames on NS

1  2 
src/nsterm.m

diff --cc src/nsterm.m
Simple merge