diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-12-31 17:57:29 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-12-31 17:57:29 -0800 |
| commit | ba809612c06bcabd05dcbaae79da39dcb0925992 (patch) | |
| tree | 2e2047c81e96710011e49fc0e492d3c58df442b5 /nextstep | |
| parent | d9ba26ec2d56e8407094571769c847b78e7c524e (diff) | |
| parent | 2fcf2dff00a55ece17f4342a934cb1d69ae1a743 (diff) | |
| download | emacs-ba809612c06bcabd05dcbaae79da39dcb0925992.tar.gz | |
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 'nextstep')
| -rw-r--r-- | nextstep/ChangeLog.1 | 2 | ||||
| -rw-r--r-- | nextstep/INSTALL | 2 | ||||
| -rw-r--r-- | nextstep/Makefile.in | 2 | ||||
| -rw-r--r-- | nextstep/README | 2 | ||||
| -rw-r--r-- | nextstep/templates/Info.plist.in | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/nextstep/ChangeLog.1 b/nextstep/ChangeLog.1 index af3680c000a..dbbe23f68b6 100644 --- a/nextstep/ChangeLog.1 +++ b/nextstep/ChangeLog.1 @@ -312,7 +312,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2008-2018 Free Software Foundation, Inc. + Copyright (C) 2008-2019 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nextstep/INSTALL b/nextstep/INSTALL index 726a897c371..f287eb77ffa 100644 --- a/nextstep/INSTALL +++ b/nextstep/INSTALL @@ -1,4 +1,4 @@ -Copyright (C) 2008-2018 Free Software Foundation, Inc. +Copyright (C) 2008-2019 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in index cb698987374..a1966f02885 100644 --- a/nextstep/Makefile.in +++ b/nextstep/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -## Copyright (C) 2012-2018 Free Software Foundation, Inc. +## Copyright (C) 2012-2019 Free Software Foundation, Inc. ## This file is part of GNU Emacs. diff --git a/nextstep/README b/nextstep/README index 66426f7d96d..83e21e666e7 100644 --- a/nextstep/README +++ b/nextstep/README @@ -105,7 +105,7 @@ future development. ---------------------------------------------------------------------- -Copyright 2008-2018 Free Software Foundation, Inc. +Copyright 2008-2019 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nextstep/templates/Info.plist.in b/nextstep/templates/Info.plist.in index 406d6f77313..c1e50a8409e 100644 --- a/nextstep/templates/Info.plist.in +++ b/nextstep/templates/Info.plist.in @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -Copyright (C) 2008-2018 Free Software Foundation, Inc. +Copyright (C) 2008-2019 Free Software Foundation, Inc. This file is part of GNU Emacs. |