Merge from trunk and resolve conflicts.

[gnu-emacs] / lib / c-ctype.h

diff --git a/lib/c-ctype.h b/lib/c-ctype.h
index 0b31309e9606620c97397d6b7429f3aa06c227ff..3a66440ae9e372bbeb2a589eec4ed900d1e7e937 100644 (file)
--- a/lib/c-ctype.h
+++ b/lib/c-ctype.h
@@ -5,7 +5,7 @@
    <ctype.h> functions' behaviour depends on the current locale set via
    setlocale.
 
-   Copyright (C) 2000-2003, 2006, 2008-2012 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2006, 2008-2013 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by