diff options
| author | Paul Eggert | 2020-01-01 01:08:16 +0000 |
|---|---|---|
| committer | Paul Eggert | 2020-01-01 01:08:16 +0000 |
| commit | c6fb86b40bebf597fccbe4eba58ceea83bd9700f (patch) | |
| tree | ab703ac6f4e85e6df08c467bc48cb7ae670f5ba9 /src/composite.h | |
| parent | 47f66e1aaf01d72e3b0db6eadbab378bfac96681 (diff) | |
| parent | 186152ba400b58d2d278c52d2e3d896decae767e (diff) | |
| download | emacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.tar.gz emacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.zip | |
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 'src/composite.h')
| -rw-r--r-- | src/composite.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/composite.h b/src/composite.h index 45d72fb345d..62c4de40e3b 100644 --- a/src/composite.h +++ b/src/composite.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* Header for composite sequence handler. | 1 | /* Header for composite sequence handler. |
| 2 | Copyright (C) 2001-2019 Free Software Foundation, Inc. | 2 | Copyright (C) 2001-2020 Free Software Foundation, Inc. |
| 3 | Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 | 3 | Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 4 | National Institute of Advanced Industrial Science and Technology (AIST) | 4 | National Institute of Advanced Industrial Science and Technology (AIST) |
| 5 | Registration Number H14PRO021 | 5 | Registration Number H14PRO021 |