[Emacs-diffs] master updated (e1d0eef -> e5ff0e6)

[Anders Lindgren]

lindydancer pushed a change to branch master.

      from  e1d0eef   Revert 692bce5b9eccfae19ae2a5a23a9ccd8d6bf86076
       new  590449f   Fix incorrect NextStep tool-bar-mode -- wrong number of 
rows in frame.
       new  cc587a3   Merge branch 'master' of 
ssh://git.sv.gnu.org/srv/git/emacs
       new  e5ff0e6   Merge branch 'master' of 
ssh://git.sv.gnu.org/srv/git/emacs


Summary of changes:
 src/nsfns.m  |    2 ++
 src/nsmenu.m |   37 ++++++++++++++++++++++++++++++++++++-
 src/nsterm.h |   10 ++++++++--
 src/nsterm.m |   27 ++++++++++++++++++++++++---
 4 files changed, 70 insertions(+), 6 deletions(-)