diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2020-01-01 01:08:16 +0000 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2020-01-01 01:08:16 +0000 |
commit | c6fb86b40bebf597fccbe4eba58ceea83bd9700f (patch) | |
tree | ab703ac6f4e85e6df08c467bc48cb7ae670f5ba9 /m4/malloca.m4 | |
parent | 47f66e1aaf01d72e3b0db6eadbab378bfac96681 (diff) | |
parent | 186152ba400b58d2d278c52d2e3d896decae767e (diff) | |
download | emacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.tar.gz |
Merge from origin/emacs-27
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
Diffstat (limited to 'm4/malloca.m4')
-rw-r--r-- | m4/malloca.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/m4/malloca.m4 b/m4/malloca.m4 index 820f40a8a88..99e9dace2c5 100644 --- a/m4/malloca.m4 +++ b/m4/malloca.m4 @@ -1,6 +1,6 @@ # malloca.m4 serial 1 -dnl Copyright (C) 2003-2004, 2006-2007, 2009-2019 Free Software Foundation, -dnl Inc. +dnl Copyright (C) 2003-2004, 2006-2007, 2009-2020 Free Software +dnl Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. |