diff options
| -rw-r--r-- | orgmode-backports.org | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org index 9c4e6e1..62b668b 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 [14/14] +** master branch [15/15] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-29 :END: +- [X] cd42244fca8785fb57c25c731afcf3227c2ad14b + + Merge from origin/emacs-29 + Stefan Kangas + Sat Jan 28 06:30:25 2023 +0100 + - [X] 114912254262ce412f30e43e3798c750a752b741 Merge from origin/emacs-29 @@ -146,11 +152,19 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Wed Nov 30 16:10:39 2022 +0100 -** emacs-29 [114/114] +** emacs-29 [115/115] :PROPERTIES: :ref: origin/emacs-29 :END: +- [X] 752c526585fe3f10e064b9ddaca6ae6cdeaa0004 + + ; Fix typos + Stefan Kangas + Fri Jan 27 11:33:35 2023 +0100 + + changelog-only + - [X] 647cc9c65e7c2b691267bde7333eff6cc8d9132a Update to Org 9.6.1-16-ge37e9b |