diff options
| author | Bastien <bzg@gnu.org> | 2020-01-27 14:55:50 +0100 |
|---|---|---|
| committer | Bastien <bzg@gnu.org> | 2020-01-27 14:55:50 +0100 |
| commit | 6f02fa596a2f1091bee5a3144a28683f871e8904 (patch) | |
| tree | 8f0e0bff853f2f080cbce8cb1b0db5275e9d0316 | |
| parent | 910bf48a144dac95ced55dd407836cd51fba9d11 (diff) | |
| parent | e982108445e40ab1d6a35144270e2d05f40e7a19 (diff) | |
| download | org-mode-6f02fa596a2f1091bee5a3144a28683f871e8904.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org-agenda.el | 1 | ||||
| -rw-r--r-- | lisp/org-attach.el | 1 | ||||
| -rw-r--r-- | lisp/org-list.el | 1 | ||||
| -rw-r--r-- | lisp/org-table.el | 1 | ||||
| -rw-r--r-- | lisp/org.el | 2 |
5 files changed, 1 insertions, 5 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 0ecafb4..ef83a97 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -3,7 +3,6 @@ ;; Copyright (C) 2004-2020 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> -;; Maintainer: Bastien Guerry <bzg at gnu dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: https://orgmode.org ;; diff --git a/lisp/org-attach.el b/lisp/org-attach.el index 498bff3..c2aa5c3 100644 --- a/lisp/org-attach.el +++ b/lisp/org-attach.el @@ -3,7 +3,6 @@ ;; Copyright (C) 2008-2020 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw@newartisans.com> -;; Maintainer: Bastien Guerry <bzg at gnu dot org> ;; Keywords: org data attachment ;; This file is part of GNU Emacs. ;; diff --git a/lisp/org-list.el b/lisp/org-list.el index 7cd8a77..b614089 100644 --- a/lisp/org-list.el +++ b/lisp/org-list.el @@ -4,7 +4,6 @@ ;; ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Bastien Guerry <bzg@gnu.org> -;; Maintainer: Bastien Guerry <bzg at gnu dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: https://orgmode.org ;; diff --git a/lisp/org-table.el b/lisp/org-table.el index 1141ee3..4976547 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -3,7 +3,6 @@ ;; Copyright (C) 2004-2020 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> -;; Maintainer: Bastien Guerry <bzg at gnu dot org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: https://orgmode.org ;; diff --git a/lisp/org.el b/lisp/org.el index 6e6e531..179ca83 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -4,7 +4,7 @@ ;; Copyright (C) 2004-2020 Free Software Foundation, Inc. ;; ;; Author: Carsten Dominik <carsten at orgmode dot org> -;; Maintainer: Bastien Guerry <bzg at gnu dot org> +;; Maintainer: Bastien Guerry <bzg@gnu.org> ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: https://orgmode.org ;; Version: 9.4-dev |