Merge from trunk

author: Stefan Monnier 2011-02-01 12:09:25 -0500
committer: Stefan Monnier 2011-02-01 12:09:25 -0500
commit: 8f1d2ef658f95549eb33fe5265f8f11c5129bece (patch)
tree: b7cd852a1adb423384532cfe22c31547160b22bc /etc/srecode
parent: 590130fb19e1f433965c421d98fedeb2d7c33310 (diff)
parent: 1dc4075fa8809805aed5092e93e225e889725c94 (diff)
download: emacs-8f1d2ef658f95549eb33fe5265f8f11c5129bece.tar.gz
emacs-8f1d2ef658f95549eb33fe5265f8f11c5129bece.zip
14 files changed, 14 insertions, 14 deletions
diff --git a/etc/srecode/cpp.srt b/etc/srecode/cpp.srt
index 85d304ee844..0b042efce69 100644
--- a/etc/srecode/cpp.srt
+++ b/etc/srecode/cpp.srt
@@ -1,6 +1,6 @@
 ;;; cpp.srt --- SRecode templates for c++-mode
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/default.srt b/etc/srecode/default.srt
index b42de2f7835..91a76321193 100644
--- a/etc/srecode/default.srt
+++ b/etc/srecode/default.srt
@@ -1,6 +1,6 @@
 ;;; default.srt --- SRecode templates for srecode-template-mode
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/doc-cpp.srt b/etc/srecode/doc-cpp.srt
index 2abe572e396..957986e8eda 100644
--- a/etc/srecode/doc-cpp.srt
+++ b/etc/srecode/doc-cpp.srt
@@ -1,6 +1,6 @@
 ;; doc-c.srt --- SRecode templates for "document" applications
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/doc-default.srt b/etc/srecode/doc-default.srt
index 2d3094df60d..24741fa7741 100644
--- a/etc/srecode/doc-default.srt
+++ b/etc/srecode/doc-default.srt
@@ -1,6 +1,6 @@
 ;; doc-default.srt --- SRecode templates for "document" applications
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/doc-java.srt b/etc/srecode/doc-java.srt
index f6ef6c9aea3..c6d2ef1fd54 100644
--- a/etc/srecode/doc-java.srt
+++ b/etc/srecode/doc-java.srt
@@ -1,6 +1,6 @@
 ;; doc-java.srt --- SRecode templates for "document" applications
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/ede-make.srt b/etc/srecode/ede-make.srt
index 09551b4f539..48c5aae5a68 100644
--- a/etc/srecode/ede-make.srt
+++ b/etc/srecode/ede-make.srt
@@ -1,6 +1,6 @@
 ;; ede-make.srt --- SRecode templates for Makefiles used by EDE.
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/el.srt b/etc/srecode/el.srt
index 9ef258ca85a..b63d560582c 100644
--- a/etc/srecode/el.srt
+++ b/etc/srecode/el.srt
@@ -1,6 +1,6 @@
 ;;; el.srt --- SRecode templates for Emacs Lisp mode
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 ;; Author: Eric Ludlam <zappo@gnu.org>
diff --git a/etc/srecode/getset-cpp.srt b/etc/srecode/getset-cpp.srt
index 3fb15f5f9da..ebca17098d5 100644
--- a/etc/srecode/getset-cpp.srt
+++ b/etc/srecode/getset-cpp.srt
@@ -1,6 +1,6 @@
 ;;; getset-cpp.srt --- SRecode templates for C++ class getter/setters.
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/java.srt b/etc/srecode/java.srt
index d4cc986a323..3059afad601 100644
--- a/etc/srecode/java.srt
+++ b/etc/srecode/java.srt
@@ -1,6 +1,6 @@
 ;; java.srt
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/make.srt b/etc/srecode/make.srt
index 81ce50ed464..d07d211a984 100644
--- a/etc/srecode/make.srt
+++ b/etc/srecode/make.srt
@@ -1,6 +1,6 @@
 ;; make.srt
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/template.srt b/etc/srecode/template.srt
index dd2dce0d947..3c9aff7ff0d 100644
--- a/etc/srecode/template.srt
+++ b/etc/srecode/template.srt
@@ -1,6 +1,6 @@
 ;;; template.srt --- Templates for Semantic Recoders
-;; Copyright (C) 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2007-2011 Free Software Foundation, Inc.
 ;; Author: Eric Ludlam <zappo@gnu.org>
diff --git a/etc/srecode/test.srt b/etc/srecode/test.srt
index 8ae5aedaeee..b296f9dc515 100644
--- a/etc/srecode/test.srt
+++ b/etc/srecode/test.srt
@@ -1,6 +1,6 @@
 ;; test.srt --- SRecode templates for testing
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/texi.srt b/etc/srecode/texi.srt
index 4d6a05942cf..abf086c7281 100644
--- a/etc/srecode/texi.srt
+++ b/etc/srecode/texi.srt
@@ -1,6 +1,6 @@
 ;; texi.srt --- SRecode templates for Texinfo
-;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/etc/srecode/wisent.srt b/etc/srecode/wisent.srt
index 5fe5d69e110..d45392e93dd 100644
--- a/etc/srecode/wisent.srt
+++ b/etc/srecode/wisent.srt
@@ -1,6 +1,6 @@
 ;; wisent.srt --- SRecode templates for Emacs/WISENT grammar files.
-;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
 ;; Author: Eric M. Ludlam <eric@siege-engine.com>
author	Stefan Monnier	2011-02-01 12:09:25 -0500
committer	Stefan Monnier	2011-02-01 12:09:25 -0500
commit	8f1d2ef658f95549eb33fe5265f8f11c5129bece (patch)
tree	b7cd852a1adb423384532cfe22c31547160b22bc /etc/srecode
parent	590130fb19e1f433965c421d98fedeb2d7c33310 (diff)
parent	1dc4075fa8809805aed5092e93e225e889725c94 (diff)
download	emacs-8f1d2ef658f95549eb33fe5265f8f11c5129bece.tar.gz emacs-8f1d2ef658f95549eb33fe5265f8f11c5129bece.zip

diff --git a/etc/srecode/cpp.srt b/etc/srecode/cpp.srt index 85d304ee844..0b042efce69 100644 --- a/etc/srecode/cpp.srt +++ b/etc/srecode/cpp.srt
@@ -1,6 +1,6 @@
1	;;; cpp.srt --- SRecode templates for c++-mode	1	;;; cpp.srt --- SRecode templates for c++-mode
2		2
3	;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.	3	;; Copyright (C) 2007-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


diff --git a/etc/srecode/default.srt b/etc/srecode/default.srt index b42de2f7835..91a76321193 100644 --- a/etc/srecode/default.srt +++ b/etc/srecode/default.srt
@@ -1,6 +1,6 @@
1	;;; default.srt --- SRecode templates for srecode-template-mode	1	;;; default.srt --- SRecode templates for srecode-template-mode
2		2
3	;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.	3	;; Copyright (C) 2007-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


diff --git a/etc/srecode/doc-cpp.srt b/etc/srecode/doc-cpp.srt index 2abe572e396..957986e8eda 100644 --- a/etc/srecode/doc-cpp.srt +++ b/etc/srecode/doc-cpp.srt
@@ -1,6 +1,6 @@
1	;; doc-c.srt --- SRecode templates for "document" applications	1	;; doc-c.srt --- SRecode templates for "document" applications
2		2
3	;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.	3	;; Copyright (C) 2008-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


diff --git a/etc/srecode/doc-default.srt b/etc/srecode/doc-default.srt index 2d3094df60d..24741fa7741 100644 --- a/etc/srecode/doc-default.srt +++ b/etc/srecode/doc-default.srt
@@ -1,6 +1,6 @@
1	;; doc-default.srt --- SRecode templates for "document" applications	1	;; doc-default.srt --- SRecode templates for "document" applications
2		2
3	;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.	3	;; Copyright (C) 2009-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


diff --git a/etc/srecode/doc-java.srt b/etc/srecode/doc-java.srt index f6ef6c9aea3..c6d2ef1fd54 100644 --- a/etc/srecode/doc-java.srt +++ b/etc/srecode/doc-java.srt
@@ -1,6 +1,6 @@
1	;; doc-java.srt --- SRecode templates for "document" applications	1	;; doc-java.srt --- SRecode templates for "document" applications
2		2
3	;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.	3	;; Copyright (C) 2009-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


diff --git a/etc/srecode/ede-make.srt b/etc/srecode/ede-make.srt index 09551b4f539..48c5aae5a68 100644 --- a/etc/srecode/ede-make.srt +++ b/etc/srecode/ede-make.srt
@@ -1,6 +1,6 @@
1	;; ede-make.srt --- SRecode templates for Makefiles used by EDE.	1	;; ede-make.srt --- SRecode templates for Makefiles used by EDE.
2		2
3	;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.	3	;; Copyright (C) 2008-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


diff --git a/etc/srecode/el.srt b/etc/srecode/el.srt index 9ef258ca85a..b63d560582c 100644 --- a/etc/srecode/el.srt +++ b/etc/srecode/el.srt
@@ -1,6 +1,6 @@
1	;;; el.srt --- SRecode templates for Emacs Lisp mode	1	;;; el.srt --- SRecode templates for Emacs Lisp mode
2		2
3	;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.	3	;; Copyright (C) 2007-2011 Free Software Foundation, Inc.
4		4
5	;; Author: Eric Ludlam <zappo@gnu.org>	5	;; Author: Eric Ludlam <zappo@gnu.org>
6		6


diff --git a/etc/srecode/getset-cpp.srt b/etc/srecode/getset-cpp.srt index 3fb15f5f9da..ebca17098d5 100644 --- a/etc/srecode/getset-cpp.srt +++ b/etc/srecode/getset-cpp.srt
@@ -1,6 +1,6 @@
1	;;; getset-cpp.srt --- SRecode templates for C++ class getter/setters.	1	;;; getset-cpp.srt --- SRecode templates for C++ class getter/setters.
2		2
3	;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.	3	;; Copyright (C) 2007-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


diff --git a/etc/srecode/java.srt b/etc/srecode/java.srt index d4cc986a323..3059afad601 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-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


diff --git a/etc/srecode/make.srt b/etc/srecode/make.srt index 81ce50ed464..d07d211a984 100644 --- a/etc/srecode/make.srt +++ b/etc/srecode/make.srt
@@ -1,6 +1,6 @@
1	;; make.srt	1	;; make.srt
2		2
3	;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.	3	;; Copyright (C) 2009-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


diff --git a/etc/srecode/template.srt b/etc/srecode/template.srt index dd2dce0d947..3c9aff7ff0d 100644 --- a/etc/srecode/template.srt +++ b/etc/srecode/template.srt
@@ -1,6 +1,6 @@
1	;;; template.srt --- Templates for Semantic Recoders	1	;;; template.srt --- Templates for Semantic Recoders
2		2
3	;; Copyright (C) 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.	3	;; Copyright (C) 2005, 2007-2011 Free Software Foundation, Inc.
4		4
5	;; Author: Eric Ludlam <zappo@gnu.org>	5	;; Author: Eric Ludlam <zappo@gnu.org>
6		6


diff --git a/etc/srecode/test.srt b/etc/srecode/test.srt index 8ae5aedaeee..b296f9dc515 100644 --- a/etc/srecode/test.srt +++ b/etc/srecode/test.srt
@@ -1,6 +1,6 @@
1	;; test.srt --- SRecode templates for testing	1	;; test.srt --- SRecode templates for testing
2		2
3	;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.	3	;; Copyright (C) 2008-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


diff --git a/etc/srecode/texi.srt b/etc/srecode/texi.srt index 4d6a05942cf..abf086c7281 100644 --- a/etc/srecode/texi.srt +++ b/etc/srecode/texi.srt
@@ -1,6 +1,6 @@
1	;; texi.srt --- SRecode templates for Texinfo	1	;; texi.srt --- SRecode templates for Texinfo
2		2
3	;; Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.	3	;; Copyright (C) 2008-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


diff --git a/etc/srecode/wisent.srt b/etc/srecode/wisent.srt index 5fe5d69e110..d45392e93dd 100644 --- a/etc/srecode/wisent.srt +++ b/etc/srecode/wisent.srt
@@ -1,6 +1,6 @@
1	;; wisent.srt --- SRecode templates for Emacs/WISENT grammar files.	1	;; wisent.srt --- SRecode templates for Emacs/WISENT grammar files.
2		2
3	;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.	3	;; Copyright (C) 2007-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