aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--orgmode-backports.org30
1 files changed, 28 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index 05e70fa..a33236d 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 [6/6]
+** master branch [7/7]
:PROPERTIES:
:ref: origin/master
:exclude-ref: origin/emacs-29
:END:
+- [X] 03892d4f7c1253bc1affeedd227eb0a1520de90e
+
+ Merge from origin/emacs-29
+ Stefan Kangas
+ Fri Dec 16 08:45:06 2022 +0100
+
- [X] 2f0bd8167c015bab729b998daa1e77d24d54ced4
Merge from origin/emacs-29
@@ -96,11 +102,31 @@ syncing, but that don't seem appropriate for Org backport.
Stefan Kangas
Wed Nov 30 16:10:39 2022 +0100
-** emacs-29 [100/100]
+** emacs-29 [103/103]
:PROPERTIES:
:ref: origin/emacs-29
:END:
+- [X] 033071692c7cd1cd550d25170d4b3168668567ac
+
+ ; Fix typos
+ Stefan Kangas
+ Fri Dec 16 08:29:28 2022 +0100
+
+ changelog-only
+
+- [X] a15cd55044c6bb4d4e9f9aec23b8b5b9cbcb38ac
+
+ ; Don't quote nil in comments
+ Stefan Kangas
+ Thu Dec 15 02:35:00 2022 +0100
+
+- [X] 01154166057e7cf289318a8cfa4d43716f26ca20
+
+ Update to Org 9.6-31-g954a95
+ Kyle Meyer
+ Sat Dec 10 16:59:46 2022 -0500
+
- [X] 26267040549da6e7f8223bea3b5344d0d5bef527
; Normalize GPLv3 license statements in new files