aboutsummaryrefslogtreecommitdiff
path: root/orgmode-backports.org
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2024-07-01 22:40:40 -0400
committerKyle Meyer <kyle@kyleam.com>2024-07-01 22:40:40 -0400
commitd10b7faac964333b3385ca606fcd3a625be8e72a (patch)
treea52cbf6cf944db7d55d3e1ad613209394e199725 /orgmode-backports.org
parentce83dede89ac0e94410bb79a8cbfc337e95f5daf (diff)
downloadorgmode-backport-notes-d10b7faac964333b3385ca606fcd3a625be8e72a.tar.gz
orgmode-backports.org: Update
Diffstat (limited to 'orgmode-backports.org')
-rw-r--r--orgmode-backports.org16
1 files changed, 14 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index 6b75ea2..4fe65e9 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 [85/85]
+** master branch [86/86]
:PROPERTIES:
:ref: origin/master
:exclude-ref: origin/emacs-30
:END:
+- [X] e2561e267fd2eb37b140a293baec79096f03290b
+
+ Merge from savannah/emacs-30
+ Po Lu
+ Sun Jun 30 10:06:09 2024 +0800
+
- [X] 48f9dde1331e1c4af1856efd41886e655d670d19
Merge from savannah/emacs-30
@@ -599,11 +605,17 @@ syncing, but that don't seem appropriate for Org backport.
Stefan Kangas
Wed Nov 30 16:10:39 2022 +0100
-** emacs-30 [7/7]
+** emacs-30 [8/8]
:PROPERTIES:
:ref: origin/emacs-30
:END:
+- [X] 45a20d781a9b00212609bf0e338bd6b1cc9ea68a
+
+ ; Fix typos in symbols
+ Stefan Kangas
+ Sat Jun 29 17:29:38 2024 +0200
+
- [X] 6cc8ffae9a6fa3bbdc71bf5eac3875000c9e7870
Update to Org 9.7.5-9-ga091ca