summaryrefslogtreecommitdiff
path: root/src/gmalloc.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 /src/gmalloc.c
parentd9ba26ec2d56e8407094571769c847b78e7c524e (diff)
parent2fcf2dff00a55ece17f4342a934cb1d69ae1a743 (diff)
downloademacs-ba809612c06bcabd05dcbaae79da39dcb0925992.tar.gz
emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.tar.bz2
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 'src/gmalloc.c')
-rw-r--r--src/gmalloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c
index c07ead741e6..c19885d9f80 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -1,5 +1,5 @@
/* Declarations for `malloc' and friends.
- Copyright (C) 1990-1993, 1995-1996, 1999, 2002-2007, 2013-2018 Free
+ Copyright (C) 1990-1993, 1995-1996, 1999, 2002-2007, 2013-2019 Free
Software Foundation, Inc.
Written May 1989 by Mike Haertel.