aboutsummaryrefslogtreecommitdiff
path: root/orgmode-backports.org
diff options
context:
space:
mode:
Diffstat (limited to 'orgmode-backports.org')
-rw-r--r--orgmode-backports.org14
1 files changed, 13 insertions, 1 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index 97fb143..156ef09 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 [10/11]
+** master branch [12/13]
:PROPERTIES:
:ref: origin/master
:END:
+- [X] 7d12c06725d733f1ea223f5fe55d506c71e44370
+
+ Merge from origin/emacs-28
+ Glenn Morris
+ Mon Oct 18 07:50:26 2021 -0700
+
+- [X] ac6ac76e3ae5ca96607ac7eba4a3ccf146fc8815
+
+ Update to Org 9.5-57-g9bc3a2
+ Kyle Meyer
+ Sat Oct 16 14:01:34 2021 -0400
+
- [X] 8aceb37b47a8f97fc42caaaf021ac06dc9f67827
Merge from origin/emacs-28