diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-12-31 17:57:29 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-12-31 17:57:29 -0800 |
| commit | ba809612c06bcabd05dcbaae79da39dcb0925992 (patch) | |
| tree | 2e2047c81e96710011e49fc0e492d3c58df442b5 /lib/gettimeofday.c | |
| parent | d9ba26ec2d56e8407094571769c847b78e7c524e (diff) | |
| parent | 2fcf2dff00a55ece17f4342a934cb1d69ae1a743 (diff) | |
| download | emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.tar.gz | |
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 'lib/gettimeofday.c')
| -rw-r--r-- | lib/gettimeofday.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c index 1bd50fa3d36..53ea1fc2ce1 100644 --- a/lib/gettimeofday.c +++ b/lib/gettimeofday.c @@ -1,6 +1,7 @@ /* Provide gettimeofday for systems that don't have it or for which it's broken. - Copyright (C) 2001-2003, 2005-2007, 2009-2018 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2007, 2009-2019 Free Software + Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by |