]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-26
authorAlan Third <alan@idiocy.org>
Sat, 29 Sep 2018 16:08:43 +0000 (17:08 +0100)
committerAlan Third <alan@idiocy.org>
Sat, 29 Sep 2018 16:08:43 +0000 (17:08 +0100)
9ad0f1d15c Fix deprecation warning
7946445962 Make all NS drawing be done from drawRect
41fa88b99b ; Fix some doc typos

1  2 
lisp/cedet/semantic/db-ref.el
lisp/cedet/semantic/scope.el
src/nsterm.m

Simple merge
Simple merge
diff --cc src/nsterm.m
Simple merge