From acc2408b94358703d8fd6a689d16088bd9da709e Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sun, 30 Jan 2022 20:33:37 -0500 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 6cdd06e..7ce3c0f 100644 --- a/orgmode-backports.org +++ b/orgmode-backports.org @@ -54,11 +54,23 @@ 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/48] +** master branch [43/50] :PROPERTIES: :ref: origin/master :END: +- [X] 19d681d24bce0bcff1417c73035d1f9e34fbcc4a + + Merge from origin/emacs-28 + Stefan Kangas + Sun Jan 16 06:51:09 2022 +0100 + +- [X] e488601849627c53b1638fbab1d115518e0ee794 + + Update to Org 9.5.2-9-g7ba24c + Kyle Meyer + Sat Jan 15 16:02:26 2022 -0500 + - [X] ad125a99273c7bd81d02d388af3c69125dfe27ee Merge from origin/emacs-28 @@ -348,11 +360,17 @@ syncing, but that don't seem appropriate for Org backport. dummy marker for emacs-28 split -** emacs-28 [118/118] +** emacs-28 [119/119] :PROPERTIES: :ref: origin/emacs-28 :END: +- [X] e488601849627c53b1638fbab1d115518e0ee794 + + Update to Org 9.5.2-9-g7ba24c + Kyle Meyer + Sat Jan 15 16:02:26 2022 -0500 + - [X] f475c5823a409356721e49577116521467680ff4 ; Copyright year fixes -- cgit v1.2.3