Mercurial > emacs
diff src/fontset.c @ 112228:417b1e4d63cd
Merge from emacs-23
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 14 Jan 2011 12:18:41 -0500 |
parents | ac49e05bfcf2 376148b31b5e |
children | ef719132ddfa |
line wrap: on
line diff
--- a/src/fontset.c Fri Jan 14 16:06:17 2011 +0100 +++ b/src/fontset.c Fri Jan 14 12:18:41 2011 -0500 @@ -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