aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--orgmode-backports.org28
1 files changed, 26 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index 7ce3c0f..4fd0fe0 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 [43/50]
+** master branch [45/53]
:PROPERTIES:
:ref: origin/master
:END:
+- [ ] d52c929e31f60ff0462371bfe27ebd479e3e82bd
+
+ (with-demoted-errors): Warn on missing `format` arg
+ Stefan Monnier
+ Fri Feb 4 19:39:53 2022 -0500
+
+- [X] 3652170d7dd3a0aa3cf59d7ccffbf13d6fa0118e
+
+ Merge from origin/emacs-28
+ Stefan Kangas
+ Mon Jan 31 06:58:23 2022 +0100
+
+- [X] 6f282b31ad7548ab744565144e0d30dd56774210
+
+ Update to Org 9.5.2-13-gdd6486
+ Kyle Meyer
+ Sun Jan 30 20:38:01 2022 -0500
+
- [X] 19d681d24bce0bcff1417c73035d1f9e34fbcc4a
Merge from origin/emacs-28
@@ -360,11 +378,17 @@ syncing, but that don't seem appropriate for Org backport.
dummy marker for emacs-28 split
-** emacs-28 [119/119]
+** emacs-28 [120/120]
:PROPERTIES:
:ref: origin/emacs-28
:END:
+- [X] 6f282b31ad7548ab744565144e0d30dd56774210
+
+ Update to Org 9.5.2-13-gdd6486
+ Kyle Meyer
+ Sun Jan 30 20:38:01 2022 -0500
+
- [X] e488601849627c53b1638fbab1d115518e0ee794
Update to Org 9.5.2-9-g7ba24c