Merge from emacs-23

[gnu-emacs] / lisp / progmodes / cc-vars.el

diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index e965cc219282b85d28f7861f308bd73eda74e360..215c0073e94e1541d65d26062026c084f34e2021 100644 (file)
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -1,7 +1,7 @@
 ;;; cc-vars.el --- user customization variables for CC Mode
 
 ;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-;;   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;;   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   Free Software Foundation, Inc.
 
 ;; Authors:    2002- Alan Mackenzie