diff options
Diffstat (limited to 'orgmode-backports.org')
| -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 80ba5bd..d77eaa3 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 [93/94] +** master branch [95/96] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-30 :END: +- [X] 0cf9886cdfb0dd3082d70cb08bd5845d8f42a813 + + Merge from origin/emacs-30 + Eli Zaretskii + Sat Sep 14 07:55:01 2024 -0400 + +- [X] 6dcd3d24045113fb0afec0d7f43e322c9baa06ab + + Merge from origin/emacs-30 + Eli Zaretskii + Sat Sep 7 06:25:15 2024 -0400 + - [X] a2684967270387d2e7ec79de148f04b7f54f2260 Merge from savannah/emacs-30 @@ -653,11 +665,29 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Wed Nov 30 16:10:39 2022 +0100 -** emacs-30 [17/17] +** emacs-30 [20/20] :PROPERTIES: :ref: origin/emacs-30 :END: +- [X] 79f68597abade27939397e0c2a50eec833e64daf + + ; * etc/ORG-NEWS: Fix typo. + Robert Pluim + Fri Sep 13 09:50:01 2024 +0200 + +- [X] 4047072c7d847afb5027dab27e97606a49c1d62e + + Update FSF's address + Stefan Kangas + Mon Sep 2 21:02:09 2024 +0200 + +- [X] 0def396fa8f4806226c4d010daa86ce5f8f9eb13 + + Update to Org 9.7.11 + Kyle Meyer + Sun Sep 1 17:51:22 2024 -0400 + - [X] 023d387a7bd41298a5c294ce163a49ba55b31ef5 Update to Org 9.7.10 |