ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-01-08 15:26:17 +01:00
parent 5fc740a230 31c1aeabae
commit 679dce0fda
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/orgcard.tex
View File

@ -1,7 +1,7 @@
% Reference Card for Org Mode
\def\orgversionnumber{7.9.2}
\def\versionyear{2012} % latest update
\def\year{2012} % latest copyright year
\def\orgversionnumber{7.9.3}
\def\versionyear{2013} % latest update
\def\year{2013} % latest copyright year
%**start of header
\newcount\columnsperpage
@ -17,8 +17,8 @@
\pdflayout=(0l)
% Nothing else needs to be changed below this line.
% Copyright (C) 1987, 1993, 1996-1997, 2001-2013
% Free Software Foundation, Inc.
% Copyright (C) 1987, 1993, 1996-1997, 2001-2013 Free Software
% Foundation, Inc.
% This file is part of GNU Emacs.

2
lisp/ob-io.el
View File

@ -1,6 +1,6 @@
;;; ob-io.el --- org-babel functions for Io evaluation
;; Copyright (C) 2012, 2013 Free Software Foundation, Inc.
;; Copyright (C) 2012-2013 Free Software Foundation, Inc.
;; Author: Andrzej Lichnerowicz
;; Keywords: literate programming, reproducible research

2
lisp/ob-scala.el
View File

@ -1,6 +1,6 @@
;;; ob-scala.el --- org-babel functions for Scala evaluation
;; Copyright (C) 2012, 2013 Free Software Foundation, Inc.
;; Copyright (C) 2012-2013 Free Software Foundation, Inc.
;; Author: Andrzej Lichnerowicz
;; Keywords: literate programming, reproducible research

2
lisp/org-crypt.el
View File

@ -1,6 +1,6 @@
;;; org-crypt.el --- Public key encryption for org-mode entries
;; Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc.
;; Copyright (C) 2007-2013 Free Software Foundation, Inc.
;; Emacs Lisp Archive Entry
;; Filename: org-crypt.el

2
lisp/org-element.el
View File

@ -1,6 +1,6 @@
;;; org-element.el --- Parser And Applications for Org syntax
;; Copyright (C) 2012, 2013 Free Software Foundation, Inc.
;; Copyright (C) 2012-2013 Free Software Foundation, Inc.
;; Author: Nicolas Goaziou <n.goaziou at gmail dot com>
;; Keywords: outlines, hypermedia, calendar, wp

6
lisp/org-html.el
View File

@ -104,7 +104,7 @@ not be modified."
@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
@ -328,7 +328,7 @@ You can also customize this for each buffer, using something like
* @licstart The following is the entire license notice for the
* JavaScript code in %PATH.
*
* Copyright (C) 2012 MathJax
* Copyright (C) 2012-2013 MathJax
*
* Licensed under the Apache License, Version 2.0 (the \"License\");
* you may not use this file except in compliance with the License.
@ -351,7 +351,7 @@ You can also customize this for each buffer, using something like
@licstart The following is the entire license notice for the
JavaScript code below.
Copyright (C) 2012 Free Software Foundation, Inc.
Copyright (C) 2012-2013 Free Software Foundation, Inc.
The JavaScript code below is free software: you can
redistribute it and/or modify it under the terms of the GNU