diff options
| -rw-r--r-- | orgmode-backports.org | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org index 9189a42..ac9ff41 100644 --- a/orgmode-backports.org +++ b/orgmode-backports.org @@ -54,12 +54,24 @@ After resolving the conflict, run NOTE: Look for "ONSYNC" for changes that should be considered when syncing, but that don't seem appropriate for Org backport. -** master branch [41/64] +** master branch [42/67] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-29 :END: +- [ ] 862dfef88d8e62d12bac3ca2e44e035a2ff5b298 + + Pacify more docstring control char warnings + Robert Pluim + Thu Feb 29 09:31:41 2024 +0100 + +- [X] 229b3edb072de490f458cf986bf34bc1ffc87837 + + Merge from origin/emacs-29 + Eli Zaretskii + Sat Feb 24 06:35:16 2024 -0500 + - [ ] 9364c28959a5b00e8ffd5d0d283ff0c0042f1bb0 ; Fix typos in symbol names @@ -472,11 +484,17 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Wed Nov 30 16:10:39 2022 +0100 -** emacs-29 [144/144] +** emacs-29 [145/145] :PROPERTIES: :ref: origin/emacs-29 :END: +- [X] e56f0ef51bfdd0e03e817670754bc813fb3702a2 + + org: Fix security prompt for downloading remote resource + Ihor Radchenko + Sat Feb 17 19:31:28 2024 +0200 + - [X] 65ba3274652a4dac37f41f872330e391cd511ae1 Revert "Update to Org 9.6.19" |