aboutsummaryrefslogtreecommitdiffstats
path: root/src/hbfont.c
diff options
context:
space:
mode:
authorPaul Eggert2020-01-01 01:08:16 +0000
committerPaul Eggert2020-01-01 01:08:16 +0000
commitc6fb86b40bebf597fccbe4eba58ceea83bd9700f (patch)
treeab703ac6f4e85e6df08c467bc48cb7ae670f5ba9 /src/hbfont.c
parent47f66e1aaf01d72e3b0db6eadbab378bfac96681 (diff)
parent186152ba400b58d2d278c52d2e3d896decae767e (diff)
downloademacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.tar.gz
emacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.zip
Merge from origin/emacs-27
186152ba40 Pacify gcc -Wunused-function on Ubuntu 18.04.3 4cd143aded Fix copyright years by hand 365e01cc9f Update copyright year to 2020 cd2c156163 ; * etc/NEWS: Make the description of XDG fallback more ac... # Conflicts: # etc/NEWS # etc/refcards/ru-refcard.tex
Diffstat (limited to 'src/hbfont.c')
-rw-r--r--src/hbfont.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/hbfont.c b/src/hbfont.c
index 2150b6656e1..576c5fe7f60 100644
--- a/src/hbfont.c
+++ b/src/hbfont.c
@@ -1,5 +1,5 @@
1/* hbfont.c -- Platform-independent support for HarfBuzz font driver. 1/* hbfont.c -- Platform-independent support for HarfBuzz font driver.
2 Copyright (C) 2019 Free Software Foundation, Inc. 2 Copyright (C) 2019-2020 Free Software Foundation, Inc.
3 3
4This file is part of GNU Emacs. 4This file is part of GNU Emacs.
5 5