[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 f428757 2/4: Merge branch 'emacs-26' of git.savan
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-26 f428757 2/4: Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26 |
Date: |
Sat, 30 Sep 2017 04:28:17 -0400 (EDT) |
branch: emacs-26
commit f428757cdb26cc3e47123e5c75bd689a14304997
Merge: 73dba0f 26d58f0
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Merge branch 'emacs-26' of git.savannah.gnu.org:/srv/git/emacs into emacs-26
---
lisp/org/ob-vala.el | 2 ++
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 3998e2d..580e272 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 3e5f0f5..096e973 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 <address@hidden>
;; 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: