aboutsummaryrefslogtreecommitdiff
path: root/orgmode-backports.org
diff options
context:
space:
mode:
Diffstat (limited to 'orgmode-backports.org')
-rw-r--r--orgmode-backports.org28
1 files changed, 26 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index 6f18d15..2e943bc 100644
--- a/orgmode-backports.org
+++ b/orgmode-backports.org
@@ -54,11 +54,29 @@ 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 [75/91]
+** master branch [77/94]
:PROPERTIES:
:ref: origin/master
:END:
+- [ ] 9230953f23c432699347bb3eeadebd82e4cbbfaa
+
+ ; Fix typos.
+ Stefan Kangas
+ Sat Jul 2 10:20:23 2022 +0200
+
+- [X] 087476bce183a404b2a7e62b15b5033504cb4819
+
+ Merge from origin/emacs-28
+ Stefan Kangas
+ Mon Jun 27 06:30:25 2022 +0200
+
+- [X] 48bda83d3591d33c5bb8292d9edb06ef3c3f93bd
+
+ Update to Org 9.5.4-3-g6dc785
+ Kyle Meyer
+ Sun Jun 26 23:00:38 2022 -0400
+
- [X] fc46552dc8273e41e40b395b554eb0e3cfa386b9
Merge from origin/emacs-28
@@ -644,11 +662,17 @@ syncing, but that don't seem appropriate for Org backport.
dummy marker for emacs-28 split
-** emacs-28 [131/131]
+** emacs-28 [132/132]
:PROPERTIES:
:ref: origin/emacs-28
:END:
+- [X] 48bda83d3591d33c5bb8292d9edb06ef3c3f93bd
+
+ Update to Org 9.5.4-3-g6dc785
+ Kyle Meyer
+ Sun Jun 26 23:00:38 2022 -0400
+
- [X] 1f6750b53a872a5747dff92b8f61cfede0c5a6a6
Avoid treating number as an enum in the org manual