diff options
Diffstat (limited to 'orgmode-backports.org')
| -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 156ef09..f43a063 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 [12/13] +** master branch [14/15] :PROPERTIES: :ref: origin/master :END: +- [X] b931e11a03fdb44e378133b10f312e38b1b3d712 + + Merge from origin/emacs-28 + Glenn Morris + Sun Oct 24 01:55:45 2021 -0700 + +- [X] 6fa520677095c5872f1d448f6f1001ee22e42276 + + Update to Org 9.5-59-g52e6f1 + Kyle Meyer + Sat Oct 23 13:46:59 2021 -0400 + - [X] 7d12c06725d733f1ea223f5fe55d506c71e44370 Merge from origin/emacs-28 @@ -135,11 +147,17 @@ syncing, but that don't seem appropriate for Org backport. dummy marker for emacs-28 split -** emacs-28 [103/103] +** emacs-28 [104/104] :PROPERTIES: :ref: origin/emacs-28 :END: +- [X] 6fa520677095c5872f1d448f6f1001ee22e42276 + + Update to Org 9.5-59-g52e6f1 + Kyle Meyer + Sat Oct 23 13:46:59 2021 -0400 + - [X] ac6ac76e3ae5ca96607ac7eba4a3ccf146fc8815 Update to Org 9.5-57-g9bc3a2 |