From 7dd3c3776215736f27820676fa27e6abdac1556b Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sun, 21 May 2023 14:28:39 -0400 Subject: orgmode-backports.org: Update --- orgmode-backports.org | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/orgmode-backports.org b/orgmode-backports.org index 2973b8c..ffa84dc 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 [26/27] +** master branch [27/29] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-29 :END: +- [X] f518543aa4ed00f91842dc5a58cc90a320e3e2e5 + + Merge from origin/emacs-29 + Eli Zaretskii + Thu May 18 07:49:49 2023 -0400 + +- [ ] 670174a6d5f7856df523505f8fb8fc90388de47f + + Eliminate some mutation of program constants + Mattias EngdegÄrd + Wed May 17 11:00:25 2023 +0200 + - [X] daf602a5c8ec9e5d94f5e1e412182760a02c2505 Merge from origin/emacs-29 @@ -233,11 +245,17 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Wed Nov 30 16:10:39 2022 +0100 -** emacs-29 [126/126] +** emacs-29 [127/127] :PROPERTIES: :ref: origin/emacs-29 :END: +- [X] 95a724abaaca40e3fbad69593cb9fab39a249742 + + Update to Org 9.6.6 + Kyle Meyer + Sun May 14 21:04:37 2023 -0400 + - [X] 0e52beeacead956cdaa7921e911afc2fd29aea61 Update to Org 9.6.5-3-g2993f4 -- cgit v1.2.3