]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge remote-tracking branch 'savannah/master' into HEAD
authorAndrea Corallo <akrl@sdf.org>
Sat, 31 Oct 2020 15:00:00 +0000 (15:00 +0000)
committerAndrea Corallo <akrl@sdf.org>
Sat, 31 Oct 2020 15:00:00 +0000 (15:00 +0000)
1  2 
.gitignore
lisp/emacs-lisp/bytecomp.el
lisp/files.el

diff --cc .gitignore
Simple merge
Simple merge
diff --cc lisp/files.el
Simple merge