diff options
Diffstat (limited to 'orgmode-backports.org')
| -rw-r--r-- | orgmode-backports.org | 40 |
1 files changed, 38 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org index 3d9f272..3b21aa9 100644 --- a/orgmode-backports.org +++ b/orgmode-backports.org @@ -54,11 +54,41 @@ 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/17] +** master branch [20/22] :PROPERTIES: :ref: origin/master :END: +- [X] b4c6ab8cb67be4d5b3e0041981968c6cce4afe89 + + Merge from origin/emacs-28 + Stefan Kangas + Sat Nov 13 07:00:30 2021 +0100 + +- [X] 42d4e24ff3f13ccbd401d93d70ecdee99b88a26d + + ; Fix typos + Stefan Kangas + Fri Nov 12 13:59:58 2021 +0100 + +- [ ] 104e90d93664892ed1a7a1631c5b0141d0552a60 + + Prefer locate-user-emacs-file + Stefan Kangas + Tue Nov 9 07:51:27 2021 +0100 + +- [X] 54fd811eecdd2ba5c1981c7b6c2108e4e2d2de5e + + Merge from origin/emacs-28 + Michael Albinus + Sun Nov 7 18:06:24 2021 +0100 + +- [X] f05b8a939b7ad57e9526510d510ff24484dcb520 + + Update to Org 9.5-68-g77e2ec + Kyle Meyer + Sat Nov 6 14:10:47 2021 -0400 + - [X] 0abf01402b4c1959b363ae1c7085fd356fb102a4 Merge from origin/emacs-28 @@ -159,11 +189,17 @@ syncing, but that don't seem appropriate for Org backport. dummy marker for emacs-28 split -** emacs-28 [106/106] +** emacs-28 [107/107] :PROPERTIES: :ref: origin/emacs-28 :END: +- [X] 42d4e24ff3f13ccbd401d93d70ecdee99b88a26d + + ; Fix typos + Stefan Kangas + Fri Nov 12 13:59:58 2021 +0100 + - [X] f05b8a939b7ad57e9526510d510ff24484dcb520 Update to Org 9.5-68-g77e2ec |