]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge remote-tracking branch 'savahnna/master' into dev
authorAndrea Corallo <akrl@sdf.org>
Sun, 21 Jun 2020 22:20:03 +0000 (00:20 +0200)
committerAndrea Corallo <akrl@sdf.org>
Sun, 21 Jun 2020 22:20:03 +0000 (00:20 +0200)
1  2 
lisp/emacs-lisp/package.el
src/lisp.h

Simple merge
diff --cc src/lisp.h
Simple merge