diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-01-09 09:36:10 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-01-09 09:36:10 -0800 |
| commit | 35cf62d95cdcd5323dcea4a5385942c342ff1d9c (patch) | |
| tree | 90358cbb033a126c4d48793a80fd804b7baaca24 /src/fontset.h | |
| parent | 59815c02506eb39b61e672528ed03885749ba529 (diff) | |
| parent | 7655cb66d86564e792b825f1a0e1a4de7d6e6db5 (diff) | |
| download | emacs-35cf62d95cdcd5323dcea4a5385942c342ff1d9c.tar.gz | |
Merge from trunk.
Diffstat (limited to 'src/fontset.h')
| -rw-r--r-- | src/fontset.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fontset.h b/src/fontset.h index 8831f4ce0b7..6d6ad5dbfc6 100644 --- a/src/fontset.h +++ b/src/fontset.h @@ -1,5 +1,5 @@ /* Header for fontset handler. - Copyright (C) 1998, 2001-2011 Free Software Foundation, Inc. + Copyright (C) 1998, 2001-2012 Free Software Foundation, Inc. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 National Institute of Advanced Industrial Science and Technology (AIST) |