]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-28
authorEli Zaretskii <eliz@gnu.org>
Fri, 18 Feb 2022 08:38:42 +0000 (10:38 +0200)
committerEli Zaretskii <eliz@gnu.org>
Fri, 18 Feb 2022 08:38:42 +0000 (10:38 +0200)
commitc2913c30b16652c72561ce4dfdf841b5b70e9991
treeaab432eecec56f22f1edf47aea7409ce766f905a
parentef1dfd2261f717136896b73dc96e7c3fbd72c14d
parent29085a668ee0e245f2890f5dcb5eaa3ea7ea62d0
Merge from origin/emacs-28

# Conflicts:
# lisp/startup.el
doc/lispref/display.texi
lisp/international/fontset.el
lisp/startup.el