Merge from emacs-23

[gnu-emacs] / src / ftfont.c

diff --git a/src/ftfont.c b/src/ftfont.c
index 66edbe16fed992667f1d458dfed251c4ab65cb19..ffa90ef8ee4e45f5e33549ab4dbba2704f712536 100644 (file)
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -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