From 01fee522434d6d4ce0098a22d38c469e38299aa6 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Thu, 5 Jan 2023 18:20:14 -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 76797df..7c8081f 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 [11/11] +** master branch [12/12] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-29 :END: +- [X] c209802f7b3721a1b95113290934a23fee88f678 + + Merge from origin/emacs-29 + Stefan Kangas + Mon Jan 2 12:06:37 2023 +0100 + - [X] 3c55fbd4adfcf5d0d0ee8fdbbd6f012fa951f0b2 Merge from origin/emacs-29 @@ -128,11 +134,17 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Wed Nov 30 16:10:39 2022 +0100 -** emacs-29 [108/108] +** emacs-29 [109/109] :PROPERTIES: :ref: origin/emacs-29 :END: +- [X] 2569ede9c496bb060e0b88428cb541088aaba1f9 + + Update to Org 9.6-81-g563a43 + Kyle Meyer + Sun Jan 1 22:24:28 2023 -0500 + - [X] cae528457cb862dc886a34240c9d4c73035b6659 ; Add 2023 to copyright years. -- cgit v1.2.3