aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/cedet/srecode/cpp.el
diff options
context:
space:
mode:
authorK. Handa2015-01-07 22:51:41 +0900
committerK. Handa2015-01-07 22:51:41 +0900
commit88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf (patch)
tree18da116400703b67738bdbbd38cc4abf4c1e929f /lisp/cedet/srecode/cpp.el
parent3f79d3131629f73da16ec121d2a0056f11b70e65 (diff)
parent95295df44cc2b6e0e2442aeff96b0fe2ceac405c (diff)
downloademacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.tar.gz
emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.zip
Merge branch master of git.sv.gnu.org:/srv/git/emacs.
Diffstat (limited to 'lisp/cedet/srecode/cpp.el')
-rw-r--r--lisp/cedet/srecode/cpp.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/cedet/srecode/cpp.el b/lisp/cedet/srecode/cpp.el
index 56a3111a39f..ec92ae30ba6 100644
--- a/lisp/cedet/srecode/cpp.el
+++ b/lisp/cedet/srecode/cpp.el
@@ -1,6 +1,6 @@
1;;; srecode/cpp.el --- C++ specific handlers for Semantic Recoder 1;;; srecode/cpp.el --- C++ specific handlers for Semantic Recoder
2 2
3;; Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. 3;; Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
4 4
5;; Author: Eric M. Ludlam <eric@siege-engine.com> 5;; Author: Eric M. Ludlam <eric@siege-engine.com>
6;; Jan Moringen <scymtym@users.sourceforge.net> 6;; Jan Moringen <scymtym@users.sourceforge.net>