1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 11:00:45 -08:00

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)
This commit is contained in:
Paul Eggert 2018-12-31 17:57:29 -08:00
commit ba809612c0
2626 changed files with 2716 additions and 2683 deletions

View file

@ -1,5 +1,5 @@
/* Coding system handler (conversion, detection, etc).
Copyright (C) 2001-2018 Free Software Foundation, Inc.
Copyright (C) 2001-2019 Free Software Foundation, Inc.
Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
2005, 2006, 2007, 2008, 2009, 2010, 2011
National Institute of Advanced Industrial Science and Technology (AIST)