Mercurial > emacs
diff src/ftfont.c @ 112228:417b1e4d63cd
Merge from emacs-23
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 14 Jan 2011 12:18:41 -0500 |
parents | a5a188ddc758 376148b31b5e |
children | ef719132ddfa |
line wrap: on
line diff
--- a/src/ftfont.c Fri Jan 14 16:06:17 2011 +0100 +++ b/src/ftfont.c Fri Jan 14 12:18:41 2011 -0500 @@ -1,6 +1,6 @@ /* ftfont.c -- FreeType font driver. - Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. - Copyright (C) 2006, 2007, 2008, 2009, 2010 + Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) Registration Number H13PRO009