mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-27

Browse source 
186152ba40 Pacify gcc -Wunused-function on Ubuntu 18.04.3
4cd143aded Fix copyright years by hand
365e01cc9f Update copyright year to 2020
cd2c156163 ; * etc/NEWS: Make the description of XDG fallback more ac...

# Conflicts:
#	etc/NEWS
#	etc/refcards/ru-refcard.tex
This commit is contained in:
Paul Eggert 2020-01-01 01:08:16 +00:00
commit c6fb86b40b
2807 changed files with 2919 additions and 2875 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/gitmerge.el
View file

@ -1,6 +1,6 @@
;;; gitmerge.el --- help merge one Emacs branch into another
;; Copyright (C) 2010-2019 Free Software Foundation, Inc.
;; Copyright (C) 2010-2020 Free Software Foundation, Inc.
;; Authors: David Engster <deng@randomsample.de>
;; Stefan Monnier <monnier@iro.umontreal.ca>