]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge remote-tracking branch 'savannah/master' into native-comp
authorAndrea Corallo <akrl@sdf.org>
Mon, 5 Apr 2021 19:00:18 +0000 (21:00 +0200)
committerAndrea Corallo <akrl@sdf.org>
Mon, 5 Apr 2021 19:00:18 +0000 (21:00 +0200)
1  2 
Makefile.in
etc/NEWS
lisp/Makefile.in
lisp/international/mule.el
src/image.c
src/pdumper.c

diff --cc Makefile.in
Simple merge
diff --cc etc/NEWS
Simple merge
Simple merge
Simple merge
diff --cc src/image.c
Simple merge
diff --cc src/pdumper.c
Simple merge