]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge remote-tracking branch 'origin/master' into scratch/pkg
authorGerd Möllmann <gerd@gnu.org>
Mon, 28 Aug 2023 14:40:29 +0000 (16:40 +0200)
committerGerd Möllmann <gerd@gnu.org>
Mon, 28 Aug 2023 14:40:29 +0000 (16:40 +0200)
1  2 
lisp/emacs-lisp/bytecomp.el
lisp/files.el
src/emacs.c
src/image.c

Simple merge
diff --cc lisp/files.el
Simple merge
diff --cc src/emacs.c
Simple merge
diff --cc src/image.c
Simple merge