aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--orgmode-backports.org40
1 files changed, 38 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index 2bf32ef..3a198f0 100644
--- a/orgmode-backports.org
+++ b/orgmode-backports.org
@@ -54,11 +54,41 @@ 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 [27/29]
+** master branch [31/34]
:PROPERTIES:
:ref: origin/master
:END:
+- [X] d601fd4692e0be3c9ee9b247c8a7bc5b2499f0eb
+
+ Merge from origin/emacs-28
+ Stefan Kangas
+ Fri Dec 10 06:30:33 2021 +0100
+
+- [X] 26fb4168b884eeb910580c42e87efb73399019c9
+
+ ; Prefer HTTPS in more URLs
+ Stefan Kangas
+ Thu Dec 9 16:26:04 2021 +0100
+
+- [ ] c1145c31adf143460911dd87b408d35ea88a1a92
+
+ Update org-compat doc string
+ Paul Eggert
+ Sun Dec 5 23:24:10 2021 -0800
+
+- [X] 520a703fa7db07ba82661e68cf4eafe7ba61a8d0
+
+ Merge from origin/emacs-28
+ Stefan Kangas
+ Sun Dec 5 06:30:35 2021 +0100
+
+- [X] c086358574e3671787394c7b9f6069760e7c6b3c
+
+ Update to Org 9.5.1-15-gdb4805
+ Kyle Meyer
+ Sat Dec 4 21:27:59 2021 -0500
+
- [X] fa2e812894b999eba8afc4b146ca5e70fa9bd1c8
Merge from origin/emacs-28
@@ -231,11 +261,17 @@ syncing, but that don't seem appropriate for Org backport.
dummy marker for emacs-28 split
-** emacs-28 [112/112]
+** emacs-28 [113/113]
:PROPERTIES:
:ref: origin/emacs-28
:END:
+- [X] 26fb4168b884eeb910580c42e87efb73399019c9
+
+ ; Prefer HTTPS in more URLs
+ Stefan Kangas
+ Thu Dec 9 16:26:04 2021 +0100
+
- [X] c086358574e3671787394c7b9f6069760e7c6b3c
Update to Org 9.5.1-15-gdb4805