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 /modules | |
| 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 'modules')
| -rw-r--r-- | modules/mod-test/Makefile | 2 | ||||
| -rw-r--r-- | modules/mod-test/mod-test.c | 2 | ||||
| -rw-r--r-- | modules/mod-test/test.el | 2 | ||||
| -rwxr-xr-x | modules/modhelp.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/modules/mod-test/Makefile b/modules/mod-test/Makefile index 3a21623d973..27ae2ae3c2c 100644 --- a/modules/mod-test/Makefile +++ b/modules/mod-test/Makefile | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | # Test GNU Emacs modules. | 1 | # Test GNU Emacs modules. |
| 2 | 2 | ||
| 3 | # Copyright 2015-2016 Free Software Foundation, Inc. | 3 | # Copyright 2015-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 | ||
diff --git a/modules/mod-test/mod-test.c b/modules/mod-test/mod-test.c index 3c8ab0fc001..50be8620bd6 100644 --- a/modules/mod-test/mod-test.c +++ b/modules/mod-test/mod-test.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Test GNU Emacs modules. | 1 | /* Test GNU Emacs modules. |
| 2 | 2 | ||
| 3 | Copyright 2015-2016 Free Software Foundation, Inc. | 3 | Copyright 2015-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 | ||
diff --git a/modules/mod-test/test.el b/modules/mod-test/test.el index 2d363c31bcd..181f13208ec 100644 --- a/modules/mod-test/test.el +++ b/modules/mod-test/test.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; Test GNU Emacs modules. | 1 | ;;; Test GNU Emacs modules. |
| 2 | 2 | ||
| 3 | ;; Copyright 2015-2016 Free Software Foundation, Inc. | 3 | ;; Copyright 2015-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 | ||
diff --git a/modules/modhelp.py b/modules/modhelp.py index 445cb3b1d09..ab2ce5c8efb 100755 --- a/modules/modhelp.py +++ b/modules/modhelp.py | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | # Module helper script. | 3 | # Module helper script. |
| 4 | 4 | ||
| 5 | # Copyright 2015-2016 Free Software Foundation, Inc. | 5 | # Copyright 2015-2017 Free Software Foundation, Inc. |
| 6 | 6 | ||
| 7 | # This file is part of GNU Emacs. | 7 | # This file is part of GNU Emacs. |
| 8 | 8 | ||