aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog.3
diff options
context:
space:
mode:
authorPaul Eggert2018-12-31 17:57:29 -0800
committerPaul Eggert2018-12-31 17:57:29 -0800
commitba809612c06bcabd05dcbaae79da39dcb0925992 (patch)
tree2e2047c81e96710011e49fc0e492d3c58df442b5 /src/ChangeLog.3
parentd9ba26ec2d56e8407094571769c847b78e7c524e (diff)
parent2fcf2dff00a55ece17f4342a934cb1d69ae1a743 (diff)
downloademacs-ba809612c06bcabd05dcbaae79da39dcb0925992.tar.gz
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/ChangeLog.3')
-rw-r--r--src/ChangeLog.32
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index c232ee01ecd..051c70f53e8 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -16503,7 +16503,7 @@ See ChangeLog.2 for earlier changes.
16503;; coding: utf-8 16503;; coding: utf-8
16504;; End: 16504;; End:
16505 16505
16506 Copyright (C) 1993, 2001-2018 Free Software Foundation, Inc. 16506 Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc.
16507 16507
16508 This file is part of GNU Emacs. 16508 This file is part of GNU Emacs.
16509 16509