diff options
| author | Paul Eggert | 2018-12-31 17:57:29 -0800 |
|---|---|---|
| committer | Paul Eggert | 2018-12-31 17:57:29 -0800 |
| commit | ba809612c06bcabd05dcbaae79da39dcb0925992 (patch) | |
| tree | 2e2047c81e96710011e49fc0e492d3c58df442b5 /src/ChangeLog.5 | |
| parent | d9ba26ec2d56e8407094571769c847b78e7c524e (diff) | |
| parent | 2fcf2dff00a55ece17f4342a934cb1d69ae1a743 (diff) | |
| download | emacs-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.5')
| -rw-r--r-- | src/ChangeLog.5 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5 index 4fa493eda47..1ab7773b06a 100644 --- a/src/ChangeLog.5 +++ b/src/ChangeLog.5 | |||
| @@ -7148,7 +7148,7 @@ See ChangeLog.4 for earlier changes. | |||
| 7148 | ;; coding: utf-8 | 7148 | ;; coding: utf-8 |
| 7149 | ;; End: | 7149 | ;; End: |
| 7150 | 7150 | ||
| 7151 | Copyright (C) 1994-1995, 2001-2018 Free Software Foundation, Inc. | 7151 | Copyright (C) 1994-1995, 2001-2019 Free Software Foundation, Inc. |
| 7152 | 7152 | ||
| 7153 | This file is part of GNU Emacs. | 7153 | This file is part of GNU Emacs. |
| 7154 | 7154 | ||