diff options
| author | Eli Zaretskii | 2024-11-30 06:35:16 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2024-11-30 06:35:16 -0500 |
| commit | ffa9ad5c1fe732c933e12a7aa65452810ea1eced (patch) | |
| tree | adc760c1640a268ee7e8388dedf89768b4a6f7d7 /java/AndroidManifest.xml.in | |
| parent | 7c90ffcf8698a55229c47845dbdb2dc6cfa9bb6f (diff) | |
| parent | d9531793206021f1ad842cbc73df939aadf5f745 (diff) | |
| download | emacs-ffa9ad5c1fe732c933e12a7aa65452810ea1eced.tar.gz emacs-ffa9ad5c1fe732c933e12a7aa65452810ea1eced.zip | |
Merge from origin/emacs-30
d9531793206 Make 'jsonrpc-default-request-timeout' a defcustom
5339c6f69ee ; Improve example of display-buffer-alist category in ELi...
e14007ad631 Update MS-Windows build instructions
# Conflicts:
# etc/NEWS
Diffstat (limited to 'java/AndroidManifest.xml.in')
0 files changed, 0 insertions, 0 deletions