; Merge from origin/emacs-25

[gnu-emacs] / lisp / progmodes / cpp.el

diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el
index faa917a87a7c6f408d21a96dcf7bbe42160d67b2..7d641ab47f09da125d1d2c31d6f0c0b33eaef9aa 100644 (file)
--- a/lisp/progmodes/cpp.el
+++ b/lisp/progmodes/cpp.el
@@ -1,6 +1,6 @@
 ;;; cpp.el --- highlight or hide text according to cpp conditionals
 
-;; Copyright (C) 1994-1995, 2001-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1994-1995, 2001-2016 Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: c, faces, tools