summaryrefslogtreecommitdiff
path: root/lib/gettime.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2018-12-31 17:57:29 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2018-12-31 17:57:29 -0800
commitba809612c06bcabd05dcbaae79da39dcb0925992 (patch)
tree2e2047c81e96710011e49fc0e492d3c58df442b5 /lib/gettime.c
parentd9ba26ec2d56e8407094571769c847b78e7c524e (diff)
parent2fcf2dff00a55ece17f4342a934cb1d69ae1a743 (diff)
downloademacs-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/gettime.c')
-rw-r--r--lib/gettime.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gettime.c b/lib/gettime.c
index bb59c44ff0e..69b6124e6dc 100644
--- a/lib/gettime.c
+++ b/lib/gettime.c
@@ -1,6 +1,7 @@
/* gettime -- get the system clock
- Copyright (C) 2002, 2004-2007, 2009-2018 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004-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