diff options
| -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 5435c1e..3e972ae 100644 --- a/orgmode-backports.org +++ b/orgmode-backports.org @@ -54,12 +54,30 @@ 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 [20/20] +** master branch [21/23] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-29 :END: +- [ ] 54d40577c4bb64d25db030b7d11ab553364e375d + + (org-table-make-reference): Fix compiler warning + Stefan Monnier + Mon Apr 10 21:33:56 2023 -0400 + +- [ ] 4f0849a9e6d29e25d23e061bd81bacce9468856d + + Remove unused values in effect context + Mattias Engdegård + Sun Apr 9 16:45:40 2023 +0200 + +- [X] 2d1a96e878ef8dd9a27fb360aa6c85b1dc9b856e + + Merge from origin/emacs-29 + Eli Zaretskii + Thu Apr 6 14:38:20 2023 -0400 + - [X] 42fba8f36b19536964d6deb6a34f3fd1c02b43dd Merge from origin/emacs-29 @@ -182,11 +200,17 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Wed Nov 30 16:10:39 2022 +0100 -** emacs-29 [121/121] +** emacs-29 [122/122] :PROPERTIES: :ref: origin/emacs-29 :END: +- [X] 479626dbac97d4415ae861c3f66fc33c5fd6fa14 + + Update to Org 9.6.3-2-gf2949d + Kyle Meyer + Sun Apr 2 23:03:32 2023 -0400 + - [X] a8c23677d3939b8af1bcddb63244fe7b5bb384a4 Update to Org 9.6.2 |