summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-08 15:34:38 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-08 15:34:38 (GMT)
commitb4ff6d972764568ad33493ecb1b9a8951ea4b471 (patch)
tree27e3d03795612592bd7f6dc2b4f1fdffbc4ee9c1
parent57f4e17f99a8419b6fd90c8c3d5826fa0696640a (diff)
parentafc7b7bf4b90cb798c778490943d4a2f4f5853d2 (diff)
downloadorg-mode-b4ff6d972764568ad33493ecb1b9a8951ea4b471.zip
org-mode-b4ff6d972764568ad33493ecb1b9a8951ea4b471.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-jsinfo.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-jsinfo.el b/lisp/org-jsinfo.el
index 969fcb1..08c0110 100644
--- a/lisp/org-jsinfo.el
+++ b/lisp/org-jsinfo.el
@@ -112,7 +112,7 @@ means to use the maximum value consistent with other options."
* @licstart The following is the entire license notice for the
* JavaScript code in %SCRIPT_PATH.
*
- * Copyright (C) 2012 Sebastian Rose
+ * Copyright (C) 2012-2013 Sebastian Rose
*
*
* The JavaScript code in this tag is free software: you can
@@ -141,7 +141,7 @@ means to use the maximum value consistent with other options."
@licstart The following is the entire license notice for the
JavaScript code in this tag.
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2012-2013 Free Software Foundation, Inc.
The JavaScript code in this tag is free software: you can
redistribute it and/or modify it under the terms of the GNU