aboutsummaryrefslogtreecommitdiff
path: root/orgmode-backports.org
diff options
context:
space:
mode:
Diffstat (limited to 'orgmode-backports.org')
-rw-r--r--orgmode-backports.org46
1 files changed, 44 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index 9a1db30..ba50efc 100644
--- a/orgmode-backports.org
+++ b/orgmode-backports.org
@@ -54,11 +54,47 @@ 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 [2/2]
+** master branch [8/8]
:PROPERTIES:
:ref: origin/master
:END:
+- [X] bb209cd5ab819c72784de7278092705e59ff41d5
+
+ Update to Org 9.5-30-g10dc9d
+ Kyle Meyer
+ Sat Oct 2 14:41:27 2021 -0400
+
+- [X] 4341e79a5fad3e5e668a3eeb1b688d1986011481
+
+ Remove bogus ":safe t" custom properties
+ Glenn Morris
+ Sat Oct 2 11:00:23 2021 -0700
+
+- [X] 62d6cecfcd1a67e15a436c5c2b975f327d9a8b50
+
+ Remove bogus ":safe nil" custom properties
+ Glenn Morris
+ Sat Oct 2 10:46:29 2021 -0700
+
+- [X] f9111d8784bf12263abbe127cdfcbe5f409c9b3b
+
+ The safe-local-variable property is a function (bug#50944)
+ Glenn Morris
+ Sat Oct 2 10:37:42 2021 -0700
+
+- [X] bd60fca2faa03034e89df68a69255656df6512ba
+
+ Fix ox-koma-letter compilation warnings
+ Lars Ingebrigtsen
+ Sat Oct 2 10:37:55 2021 +0200
+
+- [X] d505971894d83e04e8d206be1dcee1cee5e8bb93
+
+ ; Standardize some license headers
+ Glenn Morris
+ Fri Oct 1 18:07:45 2021 -0700
+
- [X] f1f57a541e4c74eec68a27c47c7416ed6c7d75dd
Fix some custom types
@@ -69,11 +105,17 @@ syncing, but that don't seem appropriate for Org backport.
dummy marker for emacs-28 split
-** emacs-28 [100/100]
+** emacs-28 [101/101]
:PROPERTIES:
:ref: origin/emacs-28
:END:
+- [X] bb209cd5ab819c72784de7278092705e59ff41d5
+
+ Update to Org 9.5-30-g10dc9d
+ Kyle Meyer
+ Sat Oct 2 14:41:27 2021 -0400
+
- [X] 4341e79a5fad3e5e668a3eeb1b688d1986011481
Remove bogus ":safe t" custom properties