aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--orgmode-backports.org22
1 files changed, 20 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index 7c8081f..e5f0477 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 [12/12]
+** master branch [13/13]
:PROPERTIES:
:ref: origin/master
:exclude-ref: origin/emacs-29
:END:
+- [X] 60240f54e5fed16a0522fb766ffef073db596f1f
+
+ Merge from origin/emacs-29
+ Stefan Kangas
+ Tue Jan 10 09:51:57 2023 +0100
+
- [X] c209802f7b3721a1b95113290934a23fee88f678
Merge from origin/emacs-29
@@ -134,11 +140,23 @@ syncing, but that don't seem appropriate for Org backport.
Stefan Kangas
Wed Nov 30 16:10:39 2022 +0100
-** emacs-29 [109/109]
+** emacs-29 [111/111]
:PROPERTIES:
:ref: origin/emacs-29
:END:
+- [X] f4f30ff4c44dcfdf780f1981aa541af713f2805f
+
+ Update to Org 9.6.1
+ Kyle Meyer
+ Wed Jan 11 21:15:37 2023 -0500
+
+- [X] e04b3d41bb41ccca3d403345b12b9a614213d488
+
+ Update to Org 9.6-90-ga6523f
+ Kyle Meyer
+ Sat Jan 7 23:50:54 2023 -0500
+
- [X] 2569ede9c496bb060e0b88428cb541088aaba1f9
Update to Org 9.6-81-g563a43