From 333f84fc5612ef64986a9320f9c3bcc67d8ee0da Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Wed, 24 Jul 2024 22:23:51 -0400 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 ab54c94..6a4ba85 100644 --- a/orgmode-backports.org +++ b/orgmode-backports.org @@ -54,12 +54,24 @@ 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 [89/90] +** master branch [91/92] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-30 :END: +- [X] db40b65825f311aaa908f7c169ff6ad3ec5a40e6 + + Merge from savannah/emacs-30 + Po Lu + Wed Jul 24 11:41:58 2024 +0800 + +- [X] 6d22bd4d3a0a9cb55bbfffb29ed3e3190c63b565 + + Merge from savannah/emacs-30 + Po Lu + Wed Jul 24 11:41:58 2024 +0800 + - [X] 153732e63813d34b057ab24fbd9e134bd3be6eaa Merge from origin/emacs-30 @@ -629,11 +641,17 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Wed Nov 30 16:10:39 2022 +0100 -** emacs-30 [14/14] +** emacs-30 [15/15] :PROPERTIES: :ref: origin/emacs-30 :END: +- [X] a79966156633ae1e49e3fef17ff7212c8f35a26f + + Standardize possessive apostrophe usage in manuals, docs, and comments + Stefan Kangas + Thu Jul 25 03:35:18 2024 +0200 + - [X] 46b192c04b162519a5e88bbf0f465a7c5e1171a9 Update to Org 9.7.8-5-gfdf0e0 -- cgit v1.2.3