Merge from emacs-23

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

diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index ad6b6787652426e42d6bb8628ef69cc0a50396da..fb0e4462d9e8458ff16c763d4f77220a3fa1dacc 100644 (file)
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -1,7 +1,7 @@
 ;;; cc-langs.el --- language specific settings 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