aboutsummaryrefslogtreecommitdiff
path: root/orgmode-backports.org
diff options
context:
space:
mode:
Diffstat (limited to 'orgmode-backports.org')
-rw-r--r--orgmode-backports.org22
1 files changed, 20 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index 5d49755..806a449 100644
--- a/orgmode-backports.org
+++ b/orgmode-backports.org
@@ -54,7 +54,7 @@ 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 [78/78]
+** master branch [80/80]
:PROPERTIES:
:ref: origin/master
:END:
@@ -64,6 +64,18 @@ Org->Emacs fixup syncs are needed before 27.2 release. These are in
km/from-emacs-master branch and will be periodically merged with Org's
master.
+- [X] 8d957f2dd8b026ec0d7178222c0e5d9f82a2b91e
+
+ Merge from origin/emacs-27
+ Amin Bandali
+ Sun Jul 4 00:14:47 2021 -0400
+
+- [X] 348b2aed0c8c3630be4c15c8e70acf7ea9c023af
+
+ Update IRC-related references to point to Libera.Chat
+ Amin Bandali
+ Sat Jul 3 23:39:18 2021 -0400
+
- [X] 19f2f2699499d87186c6f580e4ec79205d59c096
Prevent Org mode from mistakenly changing Calendar keymap
@@ -567,11 +579,17 @@ master.
- [X] b0f20651e3cbb8a66f11ffae4c18634019c20cd4
-** emacs 27 branch [196/196]
+** emacs 27 branch [197/197]
:PROPERTIES:
:ref: origin/emacs-27
:END:
+- [X] 348b2aed0c8c3630be4c15c8e70acf7ea9c023af
+
+ Update IRC-related references to point to Libera.Chat
+ Amin Bandali
+ Sat Jul 3 23:39:18 2021 -0400
+
- [X] 8c1fe1e5efa2bbaeab2cf141bd31f09abe63d4c4
Update copyright year to 2021