diff options
author | Alan Mackenzie <acm@muc.de> | 2019-03-30 17:25:53 +0000 |
---|---|---|
committer | Alan Mackenzie <acm@muc.de> | 2019-03-30 17:25:53 +0000 |
commit | 8a23e8717008d31b4648c999c7a417f4729d239f (patch) | |
tree | 63a370a78c8ce92d3ba9a95cda9d00709c7799aa /lisp/org/org-entities.el | |
parent | 2e04ddadab266d245a3bd0f6c19223ea515bdb90 (diff) | |
parent | b619777dd67e271d639c6fb1d031650af8fd79e6 (diff) | |
download | emacs-8a23e8717008d31b4648c999c7a417f4729d239f.tar.gz |
Merge branch 'master' into scratch/accurate-warning-pos
Diffstat (limited to 'lisp/org/org-entities.el')
-rw-r--r-- | lisp/org/org-entities.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org/org-entities.el b/lisp/org/org-entities.el index e291b521f90..66837f3eb0b 100644 --- a/lisp/org/org-entities.el +++ b/lisp/org/org-entities.el @@ -1,6 +1,6 @@ ;;; org-entities.el --- Support for Special Entities -*- lexical-binding: t; -*- -;; Copyright (C) 2010-2018 Free Software Foundation, Inc. +;; Copyright (C) 2010-2019 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org>, ;; Ulf Stegemann <ulf at zeitform dot de> |