diff options
| -rw-r--r-- | orgmode-backports.org | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org index 4fd0fe0..a8f0b11 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 [45/53] +** master branch [47/55] :PROPERTIES: :ref: origin/master :END: +- [X] 2ed240296c181cc677caeef1ec33befd8428aa98 + + Merge from origin/emacs-28 + Eli Zaretskii + Fri Feb 18 10:38:49 2022 +0200 + +- [X] df3492934639628f023049e032421b7beb80de57 + + Update to Org 9.5.2-15-gc5ceb6 + Kyle Meyer + Sun Feb 13 12:43:54 2022 -0500 + - [ ] d52c929e31f60ff0462371bfe27ebd479e3e82bd (with-demoted-errors): Warn on missing `format` arg @@ -378,11 +390,17 @@ syncing, but that don't seem appropriate for Org backport. dummy marker for emacs-28 split -** emacs-28 [120/120] +** emacs-28 [121/121] :PROPERTIES: :ref: origin/emacs-28 :END: +- [X] df3492934639628f023049e032421b7beb80de57 + + Update to Org 9.5.2-15-gc5ceb6 + Kyle Meyer + Sun Feb 13 12:43:54 2022 -0500 + - [X] 6f282b31ad7548ab744565144e0d30dd56774210 Update to Org 9.5.2-13-gdd6486 |