aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorEli Zaretskii2023-10-07 03:46:47 -0400
committerEli Zaretskii2023-10-07 03:46:47 -0400
commit9698058653272129203a649efdc683c5816fe286 (patch)
tree1dbf5ce72f1c4b61092717c619d20467ff19a186 /java
parent28b31480768143f9696746d30da151531706f94c (diff)
parent356e79e47fcbd9dfe650dbb12d1c5dd5f07a2772 (diff)
downloademacs-9698058653272129203a649efdc683c5816fe286.tar.gz
emacs-9698058653272129203a649efdc683c5816fe286.zip
; Merge from origin/emacs-29
The following commits were skipped: 356e79e47fc Fix tramp-test.el (don't merge with master) 34550ea8ce4 Improve Emacs 30 compatibility in tramp-tests.el (don't m...
Diffstat (limited to 'java')
0 files changed, 0 insertions, 0 deletions