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 bca2847..7743409 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 [17/17]
+** master branch [18/18]
:PROPERTIES:
:ref: origin/master
:exclude-ref: origin/emacs-29
:END:
+- [X] 839a86b02ba0043f5c8d0ac1f33c9c7b55314d00
+
+ Merge from origin/emacs-29
+ Stefan Kangas
+ Tue Feb 21 10:58:00 2023 +0100
+
- [X] 609319da870eac75cf4715de8abfaac9233d98f9
Merge from origin/emacs-29
@@ -164,11 +170,17 @@ syncing, but that don't seem appropriate for Org backport.
Stefan Kangas
Wed Nov 30 16:10:39 2022 +0100
-** emacs-29 [117/117]
+** emacs-29 [118/118]
:PROPERTIES:
:ref: origin/emacs-29
:END:
+- [X] fc4bfa76db958f48daed7c5812921b1653c31175
+
+ Update to Org 9.6.1-34-geea8da
+ Kyle Meyer
+ Mon Feb 20 00:41:31 2023 -0500
+
- [X] fe2ea5ddd8da91c8a0f3064f1447fc4fbbda68ab
Update to Org 9.6.1-31-gaf1bb1