Merge from trunk.

[gnu-emacs] / src / xfont.c

diff --git a/src/xfont.c b/src/xfont.c
index 73f1e130be0c42914d2619b240d711d2ad2db32c..bde76c0ba3ce8b975ba0e8c330eef91fae74db9c 100644 (file)
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -1,5 +1,5 @@
 /* xfont.c -- X core font driver.
-   Copyright (C) 2006-2011 Free Software Foundation, Inc.
+   Copyright (C) 2006-2012 Free Software Foundation, Inc.
    Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009