diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-12-31 17:57:29 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-12-31 17:57:29 -0800 |
| commit | ba809612c06bcabd05dcbaae79da39dcb0925992 (patch) | |
| tree | 2e2047c81e96710011e49fc0e492d3c58df442b5 /src/xftfont.c | |
| parent | d9ba26ec2d56e8407094571769c847b78e7c524e (diff) | |
| parent | 2fcf2dff00a55ece17f4342a934cb1d69ae1a743 (diff) | |
| download | emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.tar.gz emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.tar.bz2 emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.zip | |
Merge from origin/emacs-26
2fcf2df Fix copyright years by hand
26bed8b Update copyright year to 2019
2814292 Fix value of default frame height. (Bug#33921)
Diffstat (limited to 'src/xftfont.c')
| -rw-r--r-- | src/xftfont.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/xftfont.c b/src/xftfont.c index 86b8f222425..b4f50a2cf8d 100644 --- a/src/xftfont.c +++ b/src/xftfont.c @@ -1,5 +1,5 @@ /* xftfont.c -- XFT font driver. - Copyright (C) 2006-2018 Free Software Foundation, Inc. + Copyright (C) 2006-2019 Free Software Foundation, Inc. Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H13PRO009 |