diff options
| -rw-r--r-- | orgmode-backports.org | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org index da24a1e..e818d7b 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 [22/24] +** master branch [25/27] :PROPERTIES: :ref: origin/master :END: +- [X] f5498a608fe85b66a4068a5ccf88c9b3d3b88f98 + + Merge from origin/emacs-28 + Stefan Kangas + Sun Nov 28 14:59:44 2021 +0100 + +- [X] 1fffe9a210d328559da2af8facbb75286a31c74e + + ; * lisp/org/org.el: Fix version header. + Stefan Kangas + Sun Nov 28 14:54:24 2021 +0100 + +- [X] b8b2dd17c57b73357cae229e010138fd2352a46f + + Update to Org 9.5.1-11-g96d91b + Kyle Meyer + Sat Nov 27 16:25:09 2021 -0500 + - [X] 1de6a86553c15905066a93e5b761e1825f23015a Merge from origin/emacs-28 @@ -201,11 +219,23 @@ syncing, but that don't seem appropriate for Org backport. dummy marker for emacs-28 split -** emacs-28 [108/108] +** emacs-28 [110/110] :PROPERTIES: :ref: origin/emacs-28 :END: +- [X] 1fffe9a210d328559da2af8facbb75286a31c74e + + ; * lisp/org/org.el: Fix version header. + Stefan Kangas + Sun Nov 28 14:54:24 2021 +0100 + +- [X] b8b2dd17c57b73357cae229e010138fd2352a46f + + Update to Org 9.5.1-11-g96d91b + Kyle Meyer + Sat Nov 27 16:25:09 2021 -0500 + - [X] 0dd3883defc04ea02d2f77d79debf4e18157500d Update to Org 9.5-72-gc5d6656 |