aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--orgmode-backports.org16
1 files changed, 14 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index 02b7132..df2c7bf 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 [35/55]
+** master branch [36/56]
:PROPERTIES:
:ref: origin/master
:exclude-ref: origin/emacs-29
:END:
+- [X] c9d7740574758d47c8864cbada5fd2a2b2ee8911
+
+ Merge from origin/emacs-29
+ Eli Zaretskii
+ Sat Nov 11 05:31:52 2023 -0500
+
- [ ] 67977ae5974e54d34034aa7990cf22dd162c179b
Eliminate some nested repetitions in regexps
@@ -409,11 +415,17 @@ syncing, but that don't seem appropriate for Org backport.
Stefan Kangas
Wed Nov 30 16:10:39 2022 +0100
-** emacs-29 [133/133]
+** emacs-29 [134/134]
:PROPERTIES:
:ref: origin/emacs-29
:END:
+- [X] 5bdc61bc0efc704c85b78f36f5f7e5f6c42bb877
+
+ Update to Org 9.6.11
+ Kyle Meyer
+ Sun Nov 5 21:46:42 2023 -0500
+
- [X] eedd9db6190a7f69403aefe8098a554ef2b51371
Update to Org 9.6.10