aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--orgmode-backports.org24
1 files changed, 22 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index ba5f65a..8699c60 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 [31/44]
+** master branch [32/45]
:PROPERTIES:
:ref: origin/master
:exclude-ref: origin/emacs-29
:END:
+- [X] ec3ea8c036a4dd4d7b331081320502c6c8ff1961
+
+ Merge from origin/emacs-29
+ Eli Zaretskii
+ Sat Sep 2 04:28:17 2023 -0400
+
- [ ] 64269125156836060eb95b28b01b877c74e800d8
; Delete redundant defvars; font-lock is preloaded
@@ -343,11 +349,25 @@ syncing, but that don't seem appropriate for Org backport.
Stefan Kangas
Wed Nov 30 16:10:39 2022 +0100
-** emacs-29 [129/129]
+** emacs-29 [131/131]
:PROPERTIES:
:ref: origin/emacs-29
:END:
+- [X] 3550f44c17c31f829d7d51b2928a83ae381a8558
+
+ ; Fix typos
+ Stefan Kangas
+ Sat Sep 2 18:57:11 2023 +0200
+
+ changelog-only
+
+- [X] 648a5e33e80417855b908693e36cba56cd2c796c
+
+ Update to Org 9.6.8-3-g21171d
+ Kyle Meyer
+ Sun Aug 27 22:38:34 2023 -0400
+
- [X] 3eff53b4564ba7633807d67708dc9337765db259
Update to Org 9.6.7-13-g99cc96