]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge branch 'feature/tab-bar-events'
authorJuri Linkov <juri@linkov.net>
Thu, 9 Sep 2021 07:52:41 +0000 (10:52 +0300)
committerJuri Linkov <juri@linkov.net>
Thu, 9 Sep 2021 07:52:41 +0000 (10:52 +0300)
1  2 
lisp/mouse.el
lisp/tab-bar.el
src/keyboard.c
src/menu.c
src/term.c
src/w32term.c
src/xdisp.c
src/xterm.c

diff --cc lisp/mouse.el
Simple merge
diff --cc lisp/tab-bar.el
Simple merge
diff --cc src/keyboard.c
Simple merge
diff --cc src/menu.c
Simple merge
diff --cc src/term.c
Simple merge
diff --cc src/w32term.c
Simple merge
diff --cc src/xdisp.c
Simple merge
diff --cc src/xterm.c
Simple merge