]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge branch 'add_driver_option' into HEAD
authorAndrea Corallo <akrl@sdf.org>
Wed, 26 Aug 2020 19:40:00 +0000 (21:40 +0200)
committerAndrea Corallo <akrl@sdf.org>
Wed, 26 Aug 2020 19:40:00 +0000 (21:40 +0200)
1  2 
lisp/emacs-lisp/comp.el
src/comp.c

Simple merge
diff --cc src/comp.c
Simple merge