]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 136b30b 348b2ae)
Merge from origin/emacs-27
authorAmin Bandali <bandali@gnu.org>
Sun, 4 Jul 2021 04:14:47 +0000 (00:14 -0400)
committerAmin Bandali <bandali@gnu.org>
Sun, 4 Jul 2021 04:14:47 +0000 (00:14 -0400)
commit8d957f2dd8b026ec0d7178222c0e5d9f82a2b91e
tree5537b9b530f07363a978472c449a9cbf46340967tree | snapshot
parent136b30b0c44d30d642afa2ce00d804305eca3c23commit | diff
parent348b2aed0c8c3630be4c15c8e70acf7ea9c023afcommit | diff
Merge from origin/emacs-27

348b2aed0c Update IRC-related references to point to Libera.Chat
b0e725e2fe Fix typo in c-macro-expand docstring

# Conflicts:
# doc/misc/erc.texi
# doc/misc/gnus-faq.texi
# doc/misc/rcirc.texi
# etc/NEWS
# lisp/erc/erc-services.el
# lisp/erc/erc.el
# lisp/ldefs-boot.el
# lisp/net/rcirc.el
doc/misc/erc.texi diff1 | diff2 | blob | history
doc/misc/gnus-faq.texi diff1 | diff2 | blob | history
doc/misc/rcirc.texi diff1 | diff2 | blob | history
etc/NEWS.27 diff1 | | blob | history
lisp/erc/erc-backend.el diff1 | diff2 | blob | history
lisp/erc/erc-networks.el diff1 | diff2 | blob | history
lisp/erc/erc-services.el diff1 | diff2 | blob | history
lisp/erc/erc.el diff1 | diff2 | blob | history
lisp/net/rcirc.el diff1 | diff2 | blob | history
lisp/progmodes/cmacexp.el diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.