projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ec2559e 72aac80)
Merge from origin/emacs-28
authorStefan Kangas <stefankangas@gmail.com>
Wed, 28 Sep 2022 13:35:06 +0000 (15:35 +0200)
committerStefan Kangas <stefankangas@gmail.com>
Wed, 28 Sep 2022 13:35:06 +0000 (15:35 +0200)
commitd1d0f03a58fc14be06fd2b236ab39784529d46e9
tree055cbb148ed82b4b58bfdb22365fc135d890485dtree | snapshot
parentec2559e863e21c06915448e89584ed82149bfd6dcommit | diff
parent72aac80184ce8f8a66bd7558fa935c229a6f13f7commit | diff
Merge from origin/emacs-28

72aac80184 ; Fix typo
c54a64491f Add .mailmap for proper git log output
f9a072c592 ; Fix typo
3d056f6947 * doc/emacs/ack.texi (Acknowledgments): Update maintainers.
00159c086c ; Add commentary to disabled OTF support code in font.c

# Conflicts:
# src/font.c
src/font.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.