]> git.eshelyaron.com Git - emacs.git/commitdiff
; Merge from emacs-26
authorNoam Postavsky <npostavs@gmail.com>
Sun, 10 Jun 2018 22:43:43 +0000 (18:43 -0400)
committerNoam Postavsky <npostavs@gmail.com>
Sun, 10 Jun 2018 22:43:43 +0000 (18:43 -0400)
The following commits were skipped:

acaebed014 ; * src/ftfont.c (ftfont_spec_pattern): Fix whitespace.
97d61f878e Port FC_COLOR change to older fontconfig


Trivial merge