Eli Zaretskii dcd76bd48d Merge from origin/emacs-28 ... 836be7a112 ; * etc/refcards/ru-refcard.tex: Update Copyright year. 86cbc6ee4a * lisp/net/tramp-sh.el: Adapt copyright year ebe8772f65 ; Minor fixes related to copyright years 23c1ee6989 ; * test/manual/etags/ETAGS.good_N: Adjust to copyright ye... 8d3fc7ec89 * src/xfaces.c (face_for_font): Make 'hash' be uintptr_t. 19dcb237b5 ; Add 2022 to copyright years. # Conflicts: # etc/NEWS # etc/refcards/ru-refcard.tex # lib/cdefs.h # lisp/erc/erc-dcc.el # lisp/erc/erc-imenu.el # lisp/erc/erc-replace.el # lisp/image-dired.el # lisp/progmodes/xref.el # m4/alloca.m4 # m4/byteswap.m4 # m4/errno_h.m4 # m4/getopt.m4 # m4/gnulib-common.m4 # m4/inttypes.m4 # m4/stddef_h.m4 # m4/stdint.m4 # m4/sys_socket_h.m4		2022-01-01 07:03:03 -05:00
..
Emacs.desktop.in	Modernize usage of 'macOS' in doc and comments	2016-11-06 00:42:03 -07:00
Info-gnustep.plist.in	Modernize usage of 'macOS' in doc and comments	2016-11-06 00:42:03 -07:00
Info.plist.in	Merge from origin/emacs-28	2022-01-01 07:03:03 -05:00
InfoPlist.strings.in