diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2024-07-20 15:26:55 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2024-07-20 15:26:55 -0400 |
| commit | 5f71ab517b97fcc6172123dace85b7c98e4c7e12 (patch) | |
| tree | 3cc0ed1b1d04b4004352d50d009af59b182b0ab5 /orgmode-backports.org | |
| parent | b8a6b2d70755b1e07beb680ca4474382ac7fe357 (diff) | |
| download | orgmode-backport-notes-5f71ab517b97fcc6172123dace85b7c98e4c7e12.tar.gz | |
orgmode-backports.org: Update
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 aff2158..305997b 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 [87/88] +** master branch [89/90] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-30 :END: +- [X] 153732e63813d34b057ab24fbd9e134bd3be6eaa + + Merge from origin/emacs-30 + Stefan Monnier + Fri Jul 19 14:31:53 2024 -0400 + +- [X] 46f2c94949c97c95e3c0f7fede4937326ef3e234 + + Merge from savannah/emacs-30 + Po Lu + Mon Jul 15 21:12:01 2024 +0800 + - [X] df1630ad3b85538b86f054073364c9ba0c989909 Merge from savannah/emacs-30 @@ -617,11 +629,23 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Wed Nov 30 16:10:39 2022 +0100 -** emacs-30 [10/10] +** emacs-30 [12/12] :PROPERTIES: :ref: origin/emacs-30 :END: +- [X] 34c1094e607c7ec89d66702da7f298b454b7c192 + + ; Fix typo in etc/ORG-NEWS (Bug#72186) + Stefan Kangas + Fri Jul 19 11:17:58 2024 +0200 + +- [X] a6cab228d4d1a82a80eac81b057857a230eef0b5 + + ; Fix typos + Stefan Kangas + Thu Jul 18 11:46:50 2024 +0200 + - [X] 5ec73eca57c09ad1a33c56dc4cd5b965cfaef063 Update to Org 9.7.7-2-gf308d3 |