Merge multi-tty branch

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

diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el
index 228269b67bfaf2525b33dc1b07fc20c6ae658903..c5b9b0638120a0a9d182b6c704ae41ee893a5918 100644 (file)
--- a/lisp/progmodes/cc-styles.el
+++ b/lisp/progmodes/cc-styles.el
@@ -18,7 +18,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,