aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--orgmode-backports.org22
1 files changed, 20 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index a8f0b11..7f770dc 100644
--- a/orgmode-backports.org
+++ b/orgmode-backports.org
@@ -54,11 +54,23 @@ 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 [47/55]
+** master branch [49/57]
:PROPERTIES:
:ref: origin/master
:END:
+- [X] bee54495e92ddf5d75e3f68ac7e823b221306719
+
+ Merge from origin/emacs-28
+ Stefan Kangas
+ Tue Feb 22 06:30:59 2022 +0100
+
+- [X] b7a651ba3787ab8257e35f93f754c4455fc8dba4
+
+ Update to Org 9.5.2-17-gea6b74
+ Kyle Meyer
+ Sun Feb 20 14:04:28 2022 -0500
+
- [X] 2ed240296c181cc677caeef1ec33befd8428aa98
Merge from origin/emacs-28
@@ -390,11 +402,17 @@ syncing, but that don't seem appropriate for Org backport.
dummy marker for emacs-28 split
-** emacs-28 [121/121]
+** emacs-28 [122/122]
:PROPERTIES:
:ref: origin/emacs-28
:END:
+- [X] b7a651ba3787ab8257e35f93f754c4455fc8dba4
+
+ Update to Org 9.5.2-17-gea6b74
+ Kyle Meyer
+ Sun Feb 20 14:04:28 2022 -0500
+
- [X] df3492934639628f023049e032421b7beb80de57
Update to Org 9.5.2-15-gc5ceb6