diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2023-01-23 19:29:45 -0500 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2023-01-23 19:29:45 -0500 |
| commit | c6c6a991b93db160dc1f43cff353cbf5ae9b3848 (patch) | |
| tree | aa82f24a462dc1b922ab87d00fecbb881f266c1c /orgmode-backports.org | |
| parent | 15066e9b392fbcaa7f6166fc226fd0fe9b0ef677 (diff) | |
| download | orgmode-backport-notes-c6c6a991b93db160dc1f43cff353cbf5ae9b3848.tar.gz | |
orgmode-backports.org: Update
Diffstat (limited to 'orgmode-backports.org')
| -rw-r--r-- | orgmode-backports.org | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org index a6a0f23..9c4e6e1 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 [13/13] +** master branch [14/14] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-29 :END: +- [X] 114912254262ce412f30e43e3798c750a752b741 + + Merge from origin/emacs-29 + Stefan Kangas + Mon Jan 23 06:30:18 2023 +0100 + - [X] 60240f54e5fed16a0522fb766ffef073db596f1f Merge from origin/emacs-29 @@ -140,11 +146,17 @@ syncing, but that don't seem appropriate for Org backport. Stefan Kangas Wed Nov 30 16:10:39 2022 +0100 -** emacs-29 [113/113] +** emacs-29 [114/114] :PROPERTIES: :ref: origin/emacs-29 :END: +- [X] 647cc9c65e7c2b691267bde7333eff6cc8d9132a + + Update to Org 9.6.1-16-ge37e9b + Kyle Meyer + Sun Jan 22 21:53:39 2023 -0500 + - [X] 34793337783489297313c67d4a56682514877597 * lisp/org/ob-ruby.el: Fix outdated comments. |