aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2022-03-02 22:44:12 -0500
committerKyle Meyer <kyle@kyleam.com>2022-03-02 22:44:12 -0500
commit2301dda7595f69c1d8a9834e534a0cc4602604d8 (patch)
tree9a99eabbad9786b855304c7885b45b30a1b34fad
parent0a97a650002928c8cb6ae9a1e49e0885ef6696f4 (diff)
downloadorgmode-backport-notes-2301dda7595f69c1d8a9834e534a0cc4602604d8.tar.gz
orgmode-backports.org: Update
-rw-r--r--orgmode-backports.org22
1 files changed, 20 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index 7f770dc..0519cbc 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 [49/57]
+** master branch [51/59]
:PROPERTIES:
:ref: origin/master
:END:
+- [X] 1de7382b574ff9f40319d7a075d952cb944f96ca
+
+ Merge from origin/emacs-28
+ Stefan Kangas
+ Mon Feb 28 06:33:06 2022 +0100
+
+- [X] e77fc8262ad73f30b1983f403262dce6f0e4cb09
+
+ Update to Org 9.5.2-22-g33543d
+ Kyle Meyer
+ Mon Feb 28 00:11:01 2022 -0500
+
- [X] bee54495e92ddf5d75e3f68ac7e823b221306719
Merge from origin/emacs-28
@@ -402,11 +414,17 @@ syncing, but that don't seem appropriate for Org backport.
dummy marker for emacs-28 split
-** emacs-28 [122/122]
+** emacs-28 [123/123]
:PROPERTIES:
:ref: origin/emacs-28
:END:
+- [X] e77fc8262ad73f30b1983f403262dce6f0e4cb09
+
+ Update to Org 9.5.2-22-g33543d
+ Kyle Meyer
+ Mon Feb 28 00:11:01 2022 -0500
+
- [X] b7a651ba3787ab8257e35f93f754c4455fc8dba4
Update to Org 9.5.2-17-gea6b74