diff options
Diffstat (limited to 'orgmode-backports.org')
| -rw-r--r-- | orgmode-backports.org | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org index b89be78..ea26035 100644 --- a/orgmode-backports.org +++ b/orgmode-backports.org @@ -54,12 +54,24 @@ 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 [38/61] +** master branch [40/63] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-29 :END: +- [X] ecf08f0621c25ad1dfadd96399e204c389ab1695 + + Merge from savannah/emacs-29 + Po Lu + Tue Jan 2 10:28:14 2024 +0800 + +- [X] 083e90dd80a16c9c573f92e0f11603267d15d82b + + Merge from origin/emacs-29 + Po Lu + Tue Jan 2 10:19:48 2024 +0800 + - [ ] 0f3be9596fb3cf2f5e8f10fe2b3ef59546de98bb ; Prefer finder keyword "text" to deprecated keyword "wp" @@ -448,11 +460,23 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Wed Nov 30 16:10:39 2022 +0100 -** emacs-29 [138/138] +** emacs-29 [140/140] :PROPERTIES: :ref: origin/emacs-29 :END: +- [X] 8e1c56ae46754dd7baedff49a464f078f0e9912d + + ; Add 2024 to copyright years + Po Lu + Tue Jan 2 09:47:10 2024 +0800 + +- [X] 7591acfe38e3f5f3fb9b89e2b1ed08723b0298e6 + + Update to Org 9.6.15 + Kyle Meyer + Mon Jan 1 12:47:27 2024 -0500 + - [X] 55555a6a0d1d76468f8327972b3cb067b9e35f24 org-protocol: Minor copy-edits to Commentary |