diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:10:47 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-01-01 01:10:47 -0800 |
commit | bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9 (patch) | |
tree | dc5dde303bce1fbe4f04300c3691cc1ee5874f43 /etc/DISTRIB | |
parent | 772ca5db3eccdc0439d7bd18f98b7fdd38eb6397 (diff) | |
parent | 2e2a8068031b79a6cc5502b8d4c9d849ebb1dae0 (diff) | |
download | emacs-bcf244ef9be0fe61f4b9a48d3412b2c8a9f1edb9.tar.gz |
Merge from origin/emacs-25
2e2a806 Fix copyright years by hand
5badc81 Update copyright year to 2017
Diffstat (limited to 'etc/DISTRIB')
-rw-r--r-- | etc/DISTRIB | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/DISTRIB b/etc/DISTRIB index 237e7f265f9..7e3a3517f19 100644 --- a/etc/DISTRIB +++ b/etc/DISTRIB @@ -1,7 +1,7 @@ -*- text -*- GNU Emacs availability information -Copyright (C) 1986-1993, 1995, 1998, 2000-2016 Free Software Foundation, +Copyright (C) 1986-1993, 1995, 1998, 2000-2017 Free Software Foundation, Inc. See the end of the file for license conditions. |