aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2022-02-10 19:12:19 +0200
committerEli Zaretskii2022-02-10 19:12:19 +0200
commit2d897f7c6691b3f72ce43ae1827307653ed9fc0b (patch)
tree72a1acd14394797c261d514351c9f3bcf9869797 /src
parent65482864460677b74ec7a4609df14289393c1d22 (diff)
parentc30106ce9f713edea173cbb301747cbbe3766257 (diff)
downloademacs-2d897f7c6691b3f72ce43ae1827307653ed9fc0b.tar.gz
emacs-2d897f7c6691b3f72ce43ae1827307653ed9fc0b.zip
Merge from origin/emacs-28
# Conflicts: # lisp/startup.el
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions