diff options
| author | Paul Eggert | 2018-12-31 17:57:29 -0800 |
|---|---|---|
| committer | Paul Eggert | 2018-12-31 17:57:29 -0800 |
| commit | ba809612c06bcabd05dcbaae79da39dcb0925992 (patch) | |
| tree | 2e2047c81e96710011e49fc0e492d3c58df442b5 /admin/charsets | |
| parent | d9ba26ec2d56e8407094571769c847b78e7c524e (diff) | |
| parent | 2fcf2dff00a55ece17f4342a934cb1d69ae1a743 (diff) | |
| download | emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.tar.gz emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.zip | |
Merge from origin/emacs-26
2fcf2df Fix copyright years by hand
26bed8b Update copyright year to 2019
2814292 Fix value of default frame height. (Bug#33921)
Diffstat (limited to 'admin/charsets')
| -rw-r--r-- | admin/charsets/Makefile.in | 2 | ||||
| -rwxr-xr-x | admin/charsets/mapconv | 2 | ||||
| -rw-r--r-- | admin/charsets/mapfiles/README | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/admin/charsets/Makefile.in b/admin/charsets/Makefile.in index 8755c181f03..0327a5df7eb 100644 --- a/admin/charsets/Makefile.in +++ b/admin/charsets/Makefile.in | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ### @configure_input@ | 1 | ### @configure_input@ |
| 2 | 2 | ||
| 3 | # Copyright (C) 2015-2018 Free Software Foundation, Inc. | 3 | # Copyright (C) 2015-2019 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 | 5 | # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 6 | # National Institute of Advanced Industrial Science and Technology (AIST) | 6 | # National Institute of Advanced Industrial Science and Technology (AIST) |
diff --git a/admin/charsets/mapconv b/admin/charsets/mapconv index c7e7aa7d2cf..8e19972f3df 100755 --- a/admin/charsets/mapconv +++ b/admin/charsets/mapconv | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #!/bin/sh | 1 | #!/bin/sh |
| 2 | 2 | ||
| 3 | # Copyright (C) 2015-2018 Free Software Foundation, Inc. | 3 | # Copyright (C) 2015-2019 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 | 5 | # Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 6 | # National Institute of Advanced Industrial Science and Technology (AIST) | 6 | # National Institute of Advanced Industrial Science and Technology (AIST) |
diff --git a/admin/charsets/mapfiles/README b/admin/charsets/mapfiles/README index 825ec624268..7e4493bdc65 100644 --- a/admin/charsets/mapfiles/README +++ b/admin/charsets/mapfiles/README | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2009-2018 Free Software Foundation, Inc. | 1 | Copyright (C) 2009-2019 Free Software Foundation, Inc. |
| 2 | Copyright (C) 2009, 2010, 2011 | 2 | Copyright (C) 2009, 2010, 2011 |
| 3 | National Institute of Advanced Industrial Science and Technology (AIST) | 3 | National Institute of Advanced Industrial Science and Technology (AIST) |
| 4 | Registration Number H13PRO009 | 4 | Registration Number H13PRO009 |