diff options
| author | K. Handa | 2016-01-14 21:55:43 +0900 |
|---|---|---|
| committer | K. Handa | 2016-01-14 21:55:43 +0900 |
| commit | 641a3472ef245157ebcb2114f2d608cb3cb401a7 (patch) | |
| tree | 85e524c8d12caca29588382205f536b2008edc55 /src/ftfont.c | |
| parent | 9835757013569673854b692ccbb58bfb3c3ed1f7 (diff) | |
| parent | ee83b77f5ddede0fed518d0c23cf0ae38ce5b745 (diff) | |
| download | emacs-641a3472ef245157ebcb2114f2d608cb3cb401a7.tar.gz emacs-641a3472ef245157ebcb2114f2d608cb3cb401a7.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/ftfont.c')
| -rw-r--r-- | src/ftfont.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index c10f4f90c73..505d508d2e0 100644 --- a/src/ftfont.c +++ b/src/ftfont.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* ftfont.c -- FreeType font driver. | 1 | /* ftfont.c -- FreeType font driver. |
| 2 | Copyright (C) 2006-2015 Free Software Foundation, Inc. | 2 | Copyright (C) 2006-2016 Free Software Foundation, Inc. |
| 3 | Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 | 3 | Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 |
| 4 | National Institute of Advanced Industrial Science and Technology (AIST) | 4 | National Institute of Advanced Industrial Science and Technology (AIST) |
| 5 | Registration Number H13PRO009 | 5 | Registration Number H13PRO009 |