diff options
author | Tom Tromey <tromey@redhat.com> | 2013-01-05 19:36:45 -0700 |
---|---|---|
committer | Tom Tromey <tromey@redhat.com> | 2013-01-05 19:36:45 -0700 |
commit | e078a23febca14bc919c5806670479c395e3253e (patch) | |
tree | e9e4ed91feef744d525264c31974c3ed00146bcd /src/charset.c | |
parent | 63d535c829a930207b64fe733228f15a554644b1 (diff) | |
parent | 7a2657fa3bedbd977f4e11fe030cb4a210c04ab4 (diff) | |
download | emacs-e078a23febca14bc919c5806670479c395e3253e.tar.gz |
merge from trunk
Diffstat (limited to 'src/charset.c')
-rw-r--r-- | src/charset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/charset.c b/src/charset.c index 43be0e9c780..c3a4538f223 100644 --- a/src/charset.c +++ b/src/charset.c @@ -1,5 +1,5 @@ /* Basic character set support. - Copyright (C) 2001-2012 Free Software Foundation, Inc. + Copyright (C) 2001-2013 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) |