aboutsummaryrefslogtreecommitdiff
path: root/orgmode-backports.org
diff options
context:
space:
mode:
Diffstat (limited to 'orgmode-backports.org')
-rw-r--r--orgmode-backports.org16
1 files changed, 14 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index ed73b9c..09b621d 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 [19/19]
+** master branch [20/20]
:PROPERTIES:
:ref: origin/master
:exclude-ref: origin/emacs-29
:END:
+- [X] 42fba8f36b19536964d6deb6a34f3fd1c02b43dd
+
+ Merge from origin/emacs-29
+ Stefan Kangas
+ Mon Mar 20 06:30:40 2023 +0100
+
- [X] aad617870b45aa2e68159150c2354db6f7a8cf09
Merge from origin/emacs-29
@@ -176,11 +182,17 @@ syncing, but that don't seem appropriate for Org backport.
Stefan Kangas
Wed Nov 30 16:10:39 2022 +0100
-** emacs-29 [119/119]
+** emacs-29 [120/120]
:PROPERTIES:
:ref: origin/emacs-29
:END:
+- [X] 829e5dfabea9fd22b1bb04f5f388c0c52b984606
+
+ Update to Org 9.6.1-48-g92471e
+ Kyle Meyer
+ Sat Mar 18 21:41:22 2023 -0400
+
- [X] b1b3af5b90ba6f5416dfaf60e33729b32ca2f195
Update to Org 9.6.1-40-g3d817c