diff options
| author | Michael Albinus | 2023-10-13 16:18:06 +0200 |
|---|---|---|
| committer | Michael Albinus | 2023-10-13 16:18:06 +0200 |
| commit | bbccef3ceb63bc17ab9d2aee5326df5d70ce4ab3 (patch) | |
| tree | 12a21781a8aad9864e6b9e078159f38d4f6111f7 /lisp/org/org.el | |
| parent | d40f9668f9cf1dedaef3ce435498f89fe2c36385 (diff) | |
| parent | c8ea14e7825d536f41a230fc1298341a2462635e (diff) | |
| download | emacs-bbccef3ceb63bc17ab9d2aee5326df5d70ce4ab3.tar.gz emacs-bbccef3ceb63bc17ab9d2aee5326df5d70ce4ab3.zip | |
Merge from origin/emacs-29
c8ea14e7825 Handle quoted tilde in Tramp
30239759ee4 ; Set maintainer for elint.el to emacs-devel
eedd9db6190 Update to Org 9.6.10
# Conflicts:
# lisp/net/tramp-gvfs.el
Diffstat (limited to 'lisp/org/org.el')
| -rw-r--r-- | lisp/org/org.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/org/org.el b/lisp/org/org.el index 9ca7f155614..8b02721a859 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | ;; URL: https://orgmode.org | 9 | ;; URL: https://orgmode.org |
| 10 | ;; Package-Requires: ((emacs "26.1")) | 10 | ;; Package-Requires: ((emacs "26.1")) |
| 11 | 11 | ||
| 12 | ;; Version: 9.6.9 | 12 | ;; Version: 9.6.10 |
| 13 | 13 | ||
| 14 | ;; This file is part of GNU Emacs. | 14 | ;; This file is part of GNU Emacs. |
| 15 | ;; | 15 | ;; |