aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2022-01-30 20:33:37 -0500
committerKyle Meyer <kyle@kyleam.com>2022-01-30 20:33:37 -0500
commitacc2408b94358703d8fd6a689d16088bd9da709e (patch)
tree5c8a74e3929cf8a1e63f242a86b6c9fde6e4e5ba
parentf7888999c355ac7f5d37c2074a2dc8c94958637d (diff)
downloadorgmode-backport-notes-acc2408b94358703d8fd6a689d16088bd9da709e.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 6cdd06e..7ce3c0f 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 [41/48]
+** master branch [43/50]
:PROPERTIES:
:ref: origin/master
:END:
+- [X] 19d681d24bce0bcff1417c73035d1f9e34fbcc4a
+
+ Merge from origin/emacs-28
+ Stefan Kangas
+ Sun Jan 16 06:51:09 2022 +0100
+
+- [X] e488601849627c53b1638fbab1d115518e0ee794
+
+ Update to Org 9.5.2-9-g7ba24c
+ Kyle Meyer
+ Sat Jan 15 16:02:26 2022 -0500
+
- [X] ad125a99273c7bd81d02d388af3c69125dfe27ee
Merge from origin/emacs-28
@@ -348,11 +360,17 @@ syncing, but that don't seem appropriate for Org backport.
dummy marker for emacs-28 split
-** emacs-28 [118/118]
+** emacs-28 [119/119]
:PROPERTIES:
:ref: origin/emacs-28
:END:
+- [X] e488601849627c53b1638fbab1d115518e0ee794
+
+ Update to Org 9.5.2-9-g7ba24c
+ Kyle Meyer
+ Sat Jan 15 16:02:26 2022 -0500
+
- [X] f475c5823a409356721e49577116521467680ff4
; Copyright year fixes