Merge from emacs-23

[gnu-emacs] / src / fontset.c

diff --git a/src/fontset.c b/src/fontset.c
index 3de3ecbd4b9293d8cc03c3c73653fbea0ac36a1a..fbfd89f619c92158d314da16c95b63bfe4846608 100644 (file)
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1,8 +1,8 @@
 /* Fontset handler.
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
      Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006, 2007, 2008, 2009, 2010
+     2005, 2006, 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
    Copyright (C) 2003, 2006