]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-28
authorStefan Kangas <stefankangas@gmail.com>
Sun, 19 Feb 2023 16:37:59 +0000 (17:37 +0100)
committerStefan Kangas <stefankangas@gmail.com>
Sun, 19 Feb 2023 16:37:59 +0000 (17:37 +0100)
commit9a6f22fd0b4123b8698348627d63bff05e65e58f
tree5182737ba96d168c47527cfe6bb69be8ea3b6ffc
parent32be128382f61fc732a6a952855950bde72c0412
parentf5a99945b6f704c1de47511343248b22a6189bab
Merge from origin/emacs-28

f5a99945b6f ; Update ChangeLog for Emacs 28.3
f7bd5ac5521 Update HISTORY for Emacs 28.3

# Conflicts:
# etc/NEWS
ChangeLog.3
lisp/emacs-lisp/cconv.el
lisp/progmodes/cc-fonts.el
lisp/progmodes/cc-langs.el