Merge from emacs-23

[gnu-emacs] / src / xfont.c

diff --git a/src/xfont.c b/src/xfont.c
index d4c6af17c4989689ab9cac7cae71608a8812b318..c167a0ddc93467a511d4e557f7e5e4ba5f9cc168 100644 (file)
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -1,6 +1,6 @@
 /* xfont.c -- X core 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