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/deps.mk | |
| 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/deps.mk')
| -rw-r--r-- | src/deps.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/deps.mk b/src/deps.mk index f202d0e1041..2cdeba8d4ae 100644 --- a/src/deps.mk +++ b/src/deps.mk | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ### deps.mk --- src/Makefile fragment for GNU Emacs | 1 | ### deps.mk --- src/Makefile fragment for GNU Emacs |
| 2 | 2 | ||
| 3 | ## Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2018 Free Software | 3 | ## Copyright (C) 1985, 1987-1988, 1993-1995, 1999-2019 Free Software |
| 4 | ## Foundation, Inc. | 4 | ## Foundation, Inc. |
| 5 | 5 | ||
| 6 | ## This file is part of GNU Emacs. | 6 | ## This file is part of GNU Emacs. |