diff options
Diffstat (limited to 'orgmode-backports.org')
| -rw-r--r-- | orgmode-backports.org | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org index 135a517..de32ef6 100644 --- a/orgmode-backports.org +++ b/orgmode-backports.org @@ -54,20 +54,38 @@ 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 [1/1] +** master branch [2/2] :PROPERTIES: :ref: origin/master :END: +- [X] f1f57a541e4c74eec68a27c47c7416ed6c7d75dd + + Fix some custom types + Glenn Morris + Fri Oct 1 08:33:32 2021 -0700 + - [X] bd3a1c3134a130ca8edf4c13c44a8c2323ef2c90 dummy marker for emacs-28 split -** emacs-28 [94/94] +** emacs-28 [96/96] :PROPERTIES: :ref: origin/emacs-28 :END: +- [X] d505971894d83e04e8d206be1dcee1cee5e8bb93 + + ; Standardize some license headers + Glenn Morris + Fri Oct 1 18:07:45 2021 -0700 + +- [X] f1f57a541e4c74eec68a27c47c7416ed6c7d75dd + + Fix some custom types + Glenn Morris + Fri Oct 1 08:33:32 2021 -0700 + - [X] 2075411edbad954c0fdf2aa141757d834a6708b7 Fix regexp snags in org |