From 69adb5bb04a70069733ebbfe878d670b31fa5934 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Thu, 22 Dec 2022 17:27:32 -0500 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 a33236d..cacf20f 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 [7/7] +** master branch [8/8] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-29 :END: +- [X] 6c540e38f4d9528f8e6dfdc44d1b95840efab456 + + Merge from origin/emacs-29 + Stefan Kangas + Mon Dec 19 04:42:19 2022 +0100 + - [X] 03892d4f7c1253bc1affeedd227eb0a1520de90e Merge from origin/emacs-29 @@ -102,11 +108,17 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Wed Nov 30 16:10:39 2022 +0100 -** emacs-29 [103/103] +** emacs-29 [104/104] :PROPERTIES: :ref: origin/emacs-29 :END: +- [X] 3e02029642c2c4c329c95d1a1381ab4a83a606b5 + + Update to Org 9.6-49-g47d129 + Kyle Meyer + Sat Dec 17 17:28:27 2022 -0500 + - [X] 033071692c7cd1cd550d25170d4b3168668567ac ; Fix typos -- cgit v1.2.3