diff options
Diffstat (limited to 'orgmode-backports.org')
| -rw-r--r-- | orgmode-backports.org | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org index 3b21aa9..da24a1e 100644 --- a/orgmode-backports.org +++ b/orgmode-backports.org @@ -54,11 +54,23 @@ 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 [20/22] +** master branch [22/24] :PROPERTIES: :ref: origin/master :END: +- [X] 1de6a86553c15905066a93e5b761e1825f23015a + + Merge from origin/emacs-28 + Stefan Kangas + Sun Nov 21 11:18:23 2021 +0100 + +- [X] 0dd3883defc04ea02d2f77d79debf4e18157500d + + Update to Org 9.5-72-gc5d6656 + Kyle Meyer + Sat Nov 20 13:12:18 2021 -0500 + - [X] b4c6ab8cb67be4d5b3e0041981968c6cce4afe89 Merge from origin/emacs-28 @@ -189,11 +201,17 @@ syncing, but that don't seem appropriate for Org backport. dummy marker for emacs-28 split -** emacs-28 [107/107] +** emacs-28 [108/108] :PROPERTIES: :ref: origin/emacs-28 :END: +- [X] 0dd3883defc04ea02d2f77d79debf4e18157500d + + Update to Org 9.5-72-gc5d6656 + Kyle Meyer + Sat Nov 20 13:12:18 2021 -0500 + - [X] 42d4e24ff3f13ccbd401d93d70ecdee99b88a26d ; Fix typos |