diff options
| author | Paul Eggert | 2017-01-01 01:10:47 -0800 |
|---|---|---|
| committer | Paul Eggert | 2017-01-01 01:10:47 -0800 |
| commit | bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9 (patch) | |
| tree | dc5dde303bce1fbe4f04300c3691cc1ee5874f43 /GNUmakefile | |
| parent | 772ca5db3eccdc0439d7bd18f98b7fdd38eb6397 (diff) | |
| parent | 2e2a8068031b79a6cc5502b8d4c9d849ebb1dae0 (diff) | |
| download | emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.tar.gz emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.zip | |
Merge from origin/emacs-25
2e2a806 Fix copyright years by hand
5badc81 Update copyright year to 2017
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile index e6941b03b30..98d31f4afcb 100644 --- a/GNUmakefile +++ b/GNUmakefile | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | # Build Emacs from a fresh tarball or version-control checkout. | 1 | # Build Emacs from a fresh tarball or version-control checkout. |
| 2 | 2 | ||
| 3 | # Copyright (C) 2011-2016 Free Software Foundation, Inc. | 3 | # Copyright (C) 2011-2017 Free Software Foundation, Inc. |
| 4 | # | 4 | # |
| 5 | # This file is part of GNU Emacs. | 5 | # This file is part of GNU Emacs. |
| 6 | # | 6 | # |