diff options
| -rw-r--r-- | orgmode-backports.org | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org index 764f832..7a5e6b0 100644 --- a/orgmode-backports.org +++ b/orgmode-backports.org @@ -54,7 +54,7 @@ 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 [47/53] +** master branch [48/55] :PROPERTIES: :ref: origin/master :END: @@ -62,6 +62,21 @@ syncing, but that don't seem appropriate for Org backport. Emacs 27 is in pretest phase; holding on applying commits here to Org's maint in case any farther Org->Emacs fixup syncs are needed. + +- [X] ba05d005e5a81bc123ad8da928b1bccb6b160e7a + + Update copyright year to 2021 + Paul Eggert + Fri Jan 1 01:13:56 2021 -0800 + + Already covered on Org's side (99eafe378). + +- [ ] dd662fc972a75df71cdaa25a2d763d1592df1eb8 + + Fix some over-wide docstrings + Stefan Kangas + Wed Dec 30 12:44:19 2020 +0100 + - [X] 90ec81f5b243b6b7b3ebe2de394b20e8078ebc96 Merge from origin/emacs-27 @@ -392,11 +407,19 @@ Org's maint in case any farther Org->Emacs fixup syncs are needed. - [X] b0f20651e3cbb8a66f11ffae4c18634019c20cd4 -** emacs 27 branch [195/195] +** emacs 27 branch [196/196] :PROPERTIES: :ref: origin/emacs-27 :END: +- [X] 8c1fe1e5efa2bbaeab2cf141bd31f09abe63d4c4 + + Update copyright year to 2021 + Paul Eggert + Fri Jan 1 00:32:32 2021 -0800 + + Already covered on Org's side (99eafe378). + - [X] b242bbb073b501f7a4d4569c2d70cde522abbea3 ; lisp/org/org.el: Fix Version header. |