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 /admin/ChangeLog.1 | |
| 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 'admin/ChangeLog.1')
| -rw-r--r-- | admin/ChangeLog.1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/ChangeLog.1 b/admin/ChangeLog.1 index c31875094db..6889407074c 100644 --- a/admin/ChangeLog.1 +++ b/admin/ChangeLog.1 | |||
| @@ -2577,7 +2577,7 @@ | |||
| 2577 | ;; coding: utf-8 | 2577 | ;; coding: utf-8 |
| 2578 | ;; End: | 2578 | ;; End: |
| 2579 | 2579 | ||
| 2580 | Copyright (C) 2001-2018 Free Software Foundation, Inc. | 2580 | Copyright (C) 2001-2019 Free Software Foundation, Inc. |
| 2581 | 2581 | ||
| 2582 | This file is part of GNU Emacs. | 2582 | This file is part of GNU Emacs. |
| 2583 | 2583 | ||