aboutsummaryrefslogtreecommitdiffstats
path: root/src/category.c
diff options
context:
space:
mode:
authorPaul Eggert2013-01-02 08:13:04 -0800
committerPaul Eggert2013-01-02 08:13:04 -0800
commit0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch)
tree08e9265a1dd95974dc72622a9bef194682c0c716 /src/category.c
parentaca3d51dfa45794fa68a2ffb6269e34fcee2ec6c (diff)
parentd8fb8cce84b923a3289b69549e30958710ac3ebb (diff)
downloademacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.tar.gz
emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.zip
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
Diffstat (limited to 'src/category.c')
-rw-r--r--src/category.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/category.c b/src/category.c
index 31cc90bca68..30ffbd0890f 100644
--- a/src/category.c
+++ b/src/category.c
@@ -1,6 +1,6 @@
1/* GNU Emacs routines to deal with category tables. 1/* GNU Emacs routines to deal with category tables.
2 2
3Copyright (C) 1998, 2001-2012 Free Software Foundation, Inc. 3Copyright (C) 1998, 2001-2013 Free Software Foundation, Inc.
4Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 4Copyright (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)