diff options
| author | K. Handa | 2016-01-14 21:55:43 +0900 |
|---|---|---|
| committer | K. Handa | 2016-01-14 21:55:43 +0900 |
| commit | 641a3472ef245157ebcb2114f2d608cb3cb401a7 (patch) | |
| tree | 85e524c8d12caca29588382205f536b2008edc55 /modules | |
| parent | 9835757013569673854b692ccbb58bfb3c3ed1f7 (diff) | |
| parent | ee83b77f5ddede0fed518d0c23cf0ae38ce5b745 (diff) | |
| download | emacs-641a3472ef245157ebcb2114f2d608cb3cb401a7.tar.gz emacs-641a3472ef245157ebcb2114f2d608cb3cb401a7.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
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 04529db9795..3a21623d973 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 Free Software Foundation, Inc. | 3 | # Copyright 2015-2016 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 862bb81288b..bb9c8a503d4 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 Free Software Foundation, Inc. | 3 | Copyright 2015-2016 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 69bf933c7f9..2d363c31bcd 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 Free Software Foundation, Inc. | 3 | ;; Copyright 2015-2016 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 7c96f27fee1..5d8f89b31bc 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 Free Software Foundation, Inc. | 5 | # Copyright 2015-2016 Free Software Foundation, Inc. |
| 6 | 6 | ||
| 7 | # This file is part of GNU Emacs. | 7 | # This file is part of GNU Emacs. |
| 8 | 8 | ||