diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2022-12-28 11:53:54 -0500 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2022-12-28 11:53:54 -0500 |
| commit | 61fc1a4aafdef351456ddd5cf4c1333a2a200b76 (patch) | |
| tree | 69e032cc3b4f4e0f107f9db83e21f3d723b979d9 | |
| parent | 7be687759b5d2af586b980dfa4be97e4c2031585 (diff) | |
| download | orgmode-backport-notes-61fc1a4aafdef351456ddd5cf4c1333a2a200b76.tar.gz | |
orgmode-backports.org: Update
| -rw-r--r-- | orgmode-backports.org | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org index 0302d4f..1bf3176 100644 --- a/orgmode-backports.org +++ b/orgmode-backports.org @@ -54,18 +54,26 @@ 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 [8/9] +** master branch [10/10] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-29 :END: -- [ ] a5d39e11443fa30c8e8bc58254a1a59550dcd99e +- [X] 419ca81809c2eda9c9f102b7da820a6eb9685cc8 + + Merge from origin/emacs-29 + Stefan Kangas + Mon Dec 26 06:30:21 2022 +0100 + +- [X] a5d39e11443fa30c8e8bc58254a1a59550dcd99e ; Fix typos Stefan Kangas Fri Dec 23 18:21:10 2022 +0100 + Covered by cherry pick to emacs-29 (2608e5edcca). + - [X] 6c540e38f4d9528f8e6dfdc44d1b95840efab456 Merge from origin/emacs-29 @@ -114,11 +122,23 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Wed Nov 30 16:10:39 2022 +0100 -** emacs-29 [104/104] +** emacs-29 [106/106] :PROPERTIES: :ref: origin/emacs-29 :END: +- [X] 2608e5edcca5094b61b4ccebcef160cc2bfd7f83 + + ; Fix typos + Stefan Kangas + Mon Dec 26 10:42:02 2022 +0100 + +- [X] b1e68a33d89de34b432d6f39464f31a565604f3f + + Update to Org 9.6-61-g63e073f + Kyle Meyer + Sun Dec 25 11:36:36 2022 -0500 + - [X] 3e02029642c2c4c329c95d1a1381ab4a83a606b5 Update to Org 9.6-49-g47d129 |