]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge remote-tracking branch 'origin/master' into feature/pgtk
authorPo Lu <luangruo@yahoo.com>
Tue, 14 Dec 2021 09:43:16 +0000 (17:43 +0800)
committerPo Lu <luangruo@yahoo.com>
Tue, 14 Dec 2021 09:43:16 +0000 (17:43 +0800)
1  2 
.gitignore
src/xdisp.c

diff --cc .gitignore
Simple merge
diff --cc src/xdisp.c
Simple merge