aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--orgmode-backports.org16
1 files changed, 14 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index 89fe919..76797df 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 [10/10]
+** master branch [11/11]
:PROPERTIES:
:ref: origin/master
:exclude-ref: origin/emacs-29
:END:
+- [X] 3c55fbd4adfcf5d0d0ee8fdbbd6f012fa951f0b2
+
+ Merge from origin/emacs-29
+ Eli Zaretskii
+ Sun Jan 1 05:47:47 2023 -0500
+
- [X] 419ca81809c2eda9c9f102b7da820a6eb9685cc8
Merge from origin/emacs-29
@@ -122,11 +128,17 @@ syncing, but that don't seem appropriate for Org backport.
Stefan Kangas
Wed Nov 30 16:10:39 2022 +0100
-** emacs-29 [107/107]
+** emacs-29 [108/108]
:PROPERTIES:
:ref: origin/emacs-29
:END:
+- [X] cae528457cb862dc886a34240c9d4c73035b6659
+
+ ; Add 2023 to copyright years.
+ Eli Zaretskii
+ Sun Jan 1 05:31:12 2023 -0500
+
- [X] 9292f595a71870eec1ffdfd187b859cc990c2f0b
; Fix typos