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