aboutsummaryrefslogtreecommitdiffstats
path: root/java/org/gnu
diff options
context:
space:
mode:
authorEli Zaretskii2024-08-27 15:52:13 +0300
committerEli Zaretskii2024-08-27 15:52:13 +0300
commit6827335538d10cf487f07053ffb6d94259c26606 (patch)
tree17d5b69b570c0f5642bff185cbd4b794773e7e2d /java/org/gnu
parent7e17a1fff401e7cb98a9b140d791957ae3af2451 (diff)
downloademacs-6827335538d10cf487f07053ffb6d94259c26606.tar.gz
emacs-6827335538d10cf487f07053ffb6d94259c26606.zip
; Merge changes to files modified on the release branch
* ChangeLog.4: * etc/AUTHORS: merge changes mistakenly skipped by gitmerge.el Reported by Stefan Kangas <stefankangas@gmail.com>.
Diffstat (limited to 'java/org/gnu')
0 files changed, 0 insertions, 0 deletions