diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2023-08-13 21:03:34 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2023-08-13 21:04:15 -0400 |
| commit | 57d14b9e3aa54f17d045d66371ab621eb36ba80a (patch) | |
| tree | 8bba1dddba10c03ae857df0b728bd855bf5cf326 /orgmode-backports.org | |
| parent | e4dced6688e8887c0423cd8e39b30383013c3873 (diff) | |
| download | orgmode-backport-notes-57d14b9e3aa54f17d045d66371ab621eb36ba80a.tar.gz | |
orgmode-backports.org: Update
Diffstat (limited to 'orgmode-backports.org')
| -rw-r--r-- | orgmode-backports.org | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/orgmode-backports.org b/orgmode-backports.org index 80938ff..0e088de 100644 --- a/orgmode-backports.org +++ b/orgmode-backports.org @@ -54,12 +54,26 @@ 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 [29/33] +** master branch [30/37] :PROPERTIES: :ref: origin/master :exclude-ref: origin/emacs-29 :END: +- [X] a5bbc51f474568ad2e4511a08614ac8ec4ca2481 + + This is a stand-in for merges from master into feature/android, + starting with fd074f3133a3 and ending with the commit above. + + Based on diff of c75c79971975 (merge of feature/android to master) + and a5bbc51f4745, only 9082b4e6ee27 (below) touched Org files. + +- [ ] 9082b4e6ee27b995cbb61668cb437d7b91c7f5f8 + + Make binaries distributed with Emacs work on Android + Po Lu + Tue Jan 24 21:37:22 2023 +0800 + - [ ] c75c7997197502189023c9f47140474fa7fd719e ; Fix http/https thinko in org manual |