aboutsummaryrefslogtreecommitdiff
path: root/orgmode-backports.org
diff options
context:
space:
mode:
Diffstat (limited to 'orgmode-backports.org')
-rw-r--r--orgmode-backports.org14
1 files changed, 13 insertions, 1 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org
index eb053e0..354426b 100644
--- a/orgmode-backports.org
+++ b/orgmode-backports.org
@@ -54,12 +54,24 @@ 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 [42/74]
+** master branch [43/76]
:PROPERTIES:
:ref: origin/master
:exclude-ref: origin/emacs-29
:END:
+- [ ] e74eedaa2e34d7fd1c3ba9bd2632468bf36d5774
+
+ nxml-mode: Add schemas for Mono/.NET related files
+ Jostein Kjønigsen
+ Sat May 18 21:36:47 2024 +0200
+
+- [X] cd60fa42f6803d4d34dedfaea3d1ed5c16349670
+
+ Merge from origin/emacs-29
+ Eli Zaretskii
+ Sat Mar 30 04:35:24 2024 -0400
+
- [ ] 6d1c1fca0aa7c5a1ff0254af3f89a34d5309ea0d
; Simplify (with-current-buffer (get-buffer ...) ...)