aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--orgmode-backports.org40
1 files changed, 38 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index 00f2c66..9f658dc 100644
--- a/orgmode-backports.org
+++ b/orgmode-backports.org
@@ -54,11 +54,35 @@ 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 [52/59]
+** master branch [56/63]
:PROPERTIES:
:ref: origin/master
:END:
+- [X] 7cee79655656f02c36fb2858eccce477b7d90b6b
+
+ Merge from origin/emacs-28
+ Stefan Kangas
+ Mon Mar 21 06:30:40 2022 +0100
+
+- [X] f15922a57cd6177c9c945d3390a6b9918883415d
+
+ Update to Org 9.5.2-25-gaf6f12
+ Kyle Meyer
+ Sun Mar 20 21:31:32 2022 -0400
+
+- [X] 8b66adfe065e0f21ec99c88e3cbb1cb16a94c6cd
+
+ Merge from origin/emacs-28
+ Stefan Kangas
+ Mon Mar 7 06:33:56 2022 +0100
+
+- [X] cd77fd3b85f50b75d3fe24713a1ca4f622c110dd
+
+ Update to Org 9.5.2-24-g668205
+ Kyle Meyer
+ Sun Mar 6 20:18:26 2022 -0500
+
- [X] 1de7382b574ff9f40319d7a075d952cb944f96ca
Merge from origin/emacs-28
@@ -417,11 +441,23 @@ syncing, but that don't seem appropriate for Org backport.
dummy marker for emacs-28 split
-** emacs-28 [123/123]
+** emacs-28 [125/125]
:PROPERTIES:
:ref: origin/emacs-28
:END:
+- [X] f15922a57cd6177c9c945d3390a6b9918883415d
+
+ Update to Org 9.5.2-25-gaf6f12
+ Kyle Meyer
+ Sun Mar 20 21:31:32 2022 -0400
+
+- [X] cd77fd3b85f50b75d3fe24713a1ca4f622c110dd
+
+ Update to Org 9.5.2-24-g668205
+ Kyle Meyer
+ Sun Mar 6 20:18:26 2022 -0500
+
- [X] e77fc8262ad73f30b1983f403262dce6f0e4cb09
Update to Org 9.5.2-22-g33543d