aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2023-04-22 12:36:48 -0400
committerKyle Meyer <kyle@kyleam.com>2023-04-22 12:36:48 -0400
commit7fcb97002e6ff9b22c1fb41885a49271bb7a602b (patch)
tree68797521390750a833618470e64cfab44b1d7846
parent2db33fe2bb1c75af31d5b83b6e9ebe786054fbcd (diff)
downloadorgmode-backport-notes-7fcb97002e6ff9b22c1fb41885a49271bb7a602b.tar.gz
orgmode-backports.org: Update
-rw-r--r--orgmode-backports.org16
1 files changed, 14 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index 3e972ae..818bd44 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 [21/23]
+** master branch [22/24]
:PROPERTIES:
:ref: origin/master
:exclude-ref: origin/emacs-29
:END:
+- [X] f1ce49d148b334a8fb5302c4dd596aceffbb6b57
+
+ Merge from origin/emacs-29
+ Eli Zaretskii
+ Fri Apr 21 07:29:14 2023 -0400
+
- [ ] 54d40577c4bb64d25db030b7d11ab553364e375d
(org-table-make-reference): Fix compiler warning
@@ -200,11 +206,17 @@ syncing, but that don't seem appropriate for Org backport.
Stefan Kangas
Wed Nov 30 16:10:39 2022 +0100
-** emacs-29 [122/122]
+** emacs-29 [123/123]
:PROPERTIES:
:ref: origin/emacs-29
:END:
+- [X] 596b780ab71d6495f866de35c234fe65a8a7914a
+
+ Update to Org 9.6.4-2-g0f6ae7
+ Kyle Meyer
+ Sun Apr 16 21:13:08 2023 -0400
+
- [X] 479626dbac97d4415ae861c3f66fc33c5fd6fa14
Update to Org 9.6.3-2-gf2949d