summaryrefslogtreecommitdiff
path: root/doc/misc/ChangeLog.1
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 /doc/misc/ChangeLog.1
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 'doc/misc/ChangeLog.1')
-rw-r--r--doc/misc/ChangeLog.12
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/misc/ChangeLog.1 b/doc/misc/ChangeLog.1
index 9ef3f0ea6f2..9b25c90f7f6 100644
--- a/doc/misc/ChangeLog.1
+++ b/doc/misc/ChangeLog.1
@@ -12116,7 +12116,7 @@
;; coding: utf-8
;; End:
- Copyright (C) 1993-1999, 2001-2018 Free Software Foundation, Inc.
+ Copyright (C) 1993-1999, 2001-2019 Free Software Foundation, Inc.
This file is part of GNU Emacs.