From a08621249838a09e8f4d74b88a13081a5a6dd39e Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 11 Feb 2023 09:54:03 -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 62b668b..17e5245 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 [15/15] +** master branch [16/16] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-29 :END: +- [X] 207a0d9408cb97b9ae78469e2487e3075ade03f8 + + Merge from origin/emacs-29 + Stefan Kangas + Mon Jan 30 07:19:43 2023 +0100 + - [X] cd42244fca8785fb57c25c731afcf3227c2ad14b Merge from origin/emacs-29 @@ -152,11 +158,17 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Wed Nov 30 16:10:39 2022 +0100 -** emacs-29 [115/115] +** emacs-29 [116/116] :PROPERTIES: :ref: origin/emacs-29 :END: +- [X] 8360e12f0ea3a3ccf0305adab3c7ea7e38af36c1 + + Update to Org 9.6.1-23-gc45a05 + Kyle Meyer + Sun Jan 29 21:42:17 2023 -0500 + - [X] 752c526585fe3f10e064b9ddaca6ae6cdeaa0004 ; Fix typos -- cgit v1.2.3