diff options
author | Noam Postavsky <npostavs@gmail.com> | 2018-06-10 18:43:43 -0400 |
---|---|---|
committer | Noam Postavsky <npostavs@gmail.com> | 2018-06-10 18:43:43 -0400 |
commit | 78ac2480d7bd206f3207398a31830bf0625caf0a (patch) | |
tree | 8b63a8f04ad3a0acee281c92b7b147cdfd70a303 /admin | |
parent | 23e9beff8cb950112fb9f750d4b3040d3fe36e05 (diff) | |
parent | acaebed014951fdd13855aa7bba9aee60618785f (diff) | |
download | emacs-78ac2480d7bd206f3207398a31830bf0625caf0a.tar.gz |
; Merge from emacs-26
The following commits were skipped:
acaebed014 ; * src/ftfont.c (ftfont_spec_pattern): Fix whitespace.
97d61f878e Port FC_COLOR change to older fontconfig
Diffstat (limited to 'admin')
0 files changed, 0 insertions, 0 deletions