aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/cedet/srecode/java.el
diff options
context:
space:
mode:
authorPaul Eggert2011-01-14 10:14:17 -0800
committerPaul Eggert2011-01-14 10:14:17 -0800
commit8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d (patch)
tree9aed5489fdfdcf75087bf3d8e50e4f5952c8566c /lisp/cedet/srecode/java.el
parent3720fa2b1ac94b8ac9f193264bcf36990a5f43d2 (diff)
parentf80aa5bfa90dff5cd75d1f40e4ababa3c86af7fb (diff)
downloademacs-8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d.tar.gz
emacs-8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d.zip
Merge from mainline.
Diffstat (limited to 'lisp/cedet/srecode/java.el')
-rw-r--r--lisp/cedet/srecode/java.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/cedet/srecode/java.el b/lisp/cedet/srecode/java.el
index c4417b24999..97f4eb34597 100644
--- a/lisp/cedet/srecode/java.el
+++ b/lisp/cedet/srecode/java.el
@@ -1,6 +1,6 @@
1;;; srecode-java.el --- Srecode Java support 1;;; srecode-java.el --- Srecode Java support
2 2
3;; Copyright (C) 2009, 2010 Free Software Foundation, Inc. 3;; Copyright (C) 2009, 2010, 2011 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 6