From 4132376cbe4c7e8195fd895eff02fc5e307de106 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 18 Mar 2023 21:33:00 -0400 Subject: orgmode-backports.org: Update --- orgmode-backports.org | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/orgmode-backports.org b/orgmode-backports.org index 7743409..ed73b9c 100644 --- a/orgmode-backports.org +++ b/orgmode-backports.org @@ -54,12 +54,18 @@ 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 [18/18] +** master branch [19/19] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-29 :END: +- [X] aad617870b45aa2e68159150c2354db6f7a8cf09 + + Merge from origin/emacs-29 + Stefan Kangas + Mon Mar 6 06:30:13 2023 +0100 + - [X] 839a86b02ba0043f5c8d0ac1f33c9c7b55314d00 Merge from origin/emacs-29 @@ -170,11 +176,17 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Wed Nov 30 16:10:39 2022 +0100 -** emacs-29 [118/118] +** emacs-29 [119/119] :PROPERTIES: :ref: origin/emacs-29 :END: +- [X] b1b3af5b90ba6f5416dfaf60e33729b32ca2f195 + + Update to Org 9.6.1-40-g3d817c + Kyle Meyer + Sun Mar 5 17:34:13 2023 -0500 + - [X] fc4bfa76db958f48daed7c5812921b1653c31175 Update to Org 9.6.1-34-geea8da -- cgit v1.2.3