diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-01-14 12:18:41 -0500 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-01-14 12:18:41 -0500 |
commit | 77ab81d0545e980c57c0a35510ade29a9e43b4cd (patch) | |
tree | 258514dac7faab41642d8f319eb113c8a5f09690 /src/font.c | |
parent | 8faba62c38f67693535c3471d867e66757b3b04e (diff) | |
parent | fb724e553757e9d3344be443ab5f329afc9bf91c (diff) | |
download | emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.gz |
Merge from emacs-23
Diffstat (limited to 'src/font.c')
-rw-r--r-- | src/font.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/font.c b/src/font.c index 948df3f2244..667a23e4b56 100644 --- a/src/font.c +++ b/src/font.c @@ -1,9 +1,8 @@ /* font.c -- "Font" primitives. - -Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. -Copyright (C) 2006, 2007, 2008, 2009, 2010 - National Institute of Advanced Industrial Science and Technology (AIST) - Registration Number H13PRO009 + 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 This file is part of GNU Emacs. |