diff options
author | Eli Zaretskii <eliz@gnu.org> | 2017-09-29 22:03:30 +0300 |
---|---|---|
committer | Eli Zaretskii <eliz@gnu.org> | 2017-09-29 22:03:30 +0300 |
commit | f428757cdb26cc3e47123e5c75bd689a14304997 (patch) | |
tree | 02f9c3f3701429152730013225aa8a27196b35ff | |
parent | 73dba0f4665768b0263050211b61fffbc2dab165 (diff) | |
parent | 26d58f0c5865c9132e2fc559e061ef704a086d30 (diff) | |
download | emacs-f428757cdb26cc3e47123e5c75bd689a14304997.tar.gz |
Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26
-rw-r--r-- | lisp/org/ob-vala.el | 2 | ||||
-rw-r--r-- | lisp/org/org-duration.el | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lisp/org/ob-vala.el b/lisp/org/ob-vala.el index 3998e2d4e28..580e27246d3 100644 --- a/lisp/org/ob-vala.el +++ b/lisp/org/ob-vala.el @@ -8,6 +8,8 @@ ;;; License: +;; This file is part of GNU Emacs. + ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or diff --git a/lisp/org/org-duration.el b/lisp/org/org-duration.el index 3e5f0f56a5b..096e973d340 100644 --- a/lisp/org/org-duration.el +++ b/lisp/org/org-duration.el @@ -1,22 +1,24 @@ ;;; org-duration.el --- Library handling durations -*- lexical-binding: t; -*- -;; Copyright (C) 2017 Free Software Foundation, Inc. +;; Copyright (C) 2017 Free Software Foundation, Inc. ;; Author: Nicolas Goaziou <mail@nicolasgoaziou.fr> ;; Keywords: outlines, hypermedia, calendar, wp -;; This program is free software; you can redistribute it and/or modify +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. -;; This program is distributed in the hope that it will be useful, +;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see <https://www.gnu.org/licenses/>. +;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. ;;; Commentary: |