aboutsummaryrefslogtreecommitdiffstats
path: root/etc/srecode/java.srt
diff options
context:
space:
mode:
authorStefan Monnier2011-01-14 12:18:41 -0500
committerStefan Monnier2011-01-14 12:18:41 -0500
commit77ab81d0545e980c57c0a35510ade29a9e43b4cd (patch)
tree258514dac7faab41642d8f319eb113c8a5f09690 /etc/srecode/java.srt
parent8faba62c38f67693535c3471d867e66757b3b04e (diff)
parentfb724e553757e9d3344be443ab5f329afc9bf91c (diff)
downloademacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.gz
emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.zip
Merge from emacs-23
Diffstat (limited to 'etc/srecode/java.srt')
-rw-r--r--etc/srecode/java.srt2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/srecode/java.srt b/etc/srecode/java.srt
index d4cc986a323..dad58829b28 100644
--- a/etc/srecode/java.srt
+++ b/etc/srecode/java.srt
@@ -1,6 +1,6 @@
1;; java.srt 1;; java.srt
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