From a305a34e94290355c2fdf69dd3763682258f72a0 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sun, 19 Feb 2023 18:04:26 -0500 Subject: orgmode-backports.org: Update --- orgmode-backports.org | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'orgmode-backports.org') diff --git a/orgmode-backports.org b/orgmode-backports.org index 17e5245..bca2847 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 [16/16] +** master branch [17/17] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-29 :END: +- [X] 609319da870eac75cf4715de8abfaac9233d98f9 + + Merge from origin/emacs-29 + Stefan Kangas + Mon Feb 13 06:30:12 2023 +0100 + - [X] 207a0d9408cb97b9ae78469e2487e3075ade03f8 Merge from origin/emacs-29 @@ -158,11 +164,17 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Wed Nov 30 16:10:39 2022 +0100 -** emacs-29 [116/116] +** emacs-29 [117/117] :PROPERTIES: :ref: origin/emacs-29 :END: +- [X] fe2ea5ddd8da91c8a0f3064f1447fc4fbbda68ab + + Update to Org 9.6.1-31-gaf1bb1 + Kyle Meyer + Sun Feb 12 15:43:07 2023 -0500 + - [X] 8360e12f0ea3a3ccf0305adab3c7ea7e38af36c1 Update to Org 9.6.1-23-gc45a05 -- cgit v1.2.3