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 ea26035..37b8263 100644 --- a/orgmode-backports.org +++ b/orgmode-backports.org @@ -54,12 +54,18 @@ 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 [40/63] +** master branch [41/64] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-29 :END: +- [X] 1b31a784bfb56c3c5d138d906601428ebd3e737b + + Merge from origin/emacs-29 + Eli Zaretskii + Sat Jan 20 06:25:59 2024 -0500 + - [X] ecf08f0621c25ad1dfadd96399e204c389ab1695 Merge from savannah/emacs-29 @@ -460,11 +466,23 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Wed Nov 30 16:10:39 2022 +0100 -** emacs-29 [140/140] +** emacs-29 [142/142] :PROPERTIES: :ref: origin/emacs-29 :END: +- [X] 725a3f32f8ba78ac5fffcd03be5b82cbc2c1b275 + + ; Fix typos in symbol names + Stefan Kangas + Sun Jan 14 15:16:54 2024 +0100 + +- [X] 6653ee66ca5ebd42322613a09d4c0d2e35af924b + + Improve two docstrings in ox-latex + Stefan Kangas + Sun Jan 14 14:52:17 2024 +0100 + - [X] 8e1c56ae46754dd7baedff49a464f078f0e9912d ; Add 2024 to copyright years |