diff options
| author | Paul Eggert | 2018-01-01 01:19:57 +0000 |
|---|---|---|
| committer | Paul Eggert | 2017-12-31 17:21:33 -0800 |
| commit | 220a9ecba1b62e09703cb0a3c122797d4498ccc2 (patch) | |
| tree | 97d286479f4b8c15205f78e61635de9b93993707 /m4/st_dm_mode.m4 | |
| parent | 312c5655669a882186884626f0cf361de70e679d (diff) | |
| download | emacs-220a9ecba1b62e09703cb0a3c122797d4498ccc2.tar.gz emacs-220a9ecba1b62e09703cb0a3c122797d4498ccc2.zip | |
Merge from Gnulib
This incorporates:
2018-01-01 maint: Run 'make update-copyright'
2017-12-29 Add cross-compilation results for GNU/Hurd.
2017-12-12 explicit_bzero: port to macOS + Clang 9.0.0
Diffstat (limited to 'm4/st_dm_mode.m4')
| -rw-r--r-- | m4/st_dm_mode.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/m4/st_dm_mode.m4 b/m4/st_dm_mode.m4 index ed2cff8c2cc..0fa7afad1f2 100644 --- a/m4/st_dm_mode.m4 +++ b/m4/st_dm_mode.m4 | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | # serial 6 | 1 | # serial 6 |
| 2 | 2 | ||
| 3 | # Copyright (C) 1998-1999, 2001, 2009-2017 Free Software Foundation, Inc. | 3 | # Copyright (C) 1998-1999, 2001, 2009-2018 Free Software Foundation, Inc. |
| 4 | # This file is free software; the Free Software Foundation | 4 | # This file is free software; the Free Software Foundation |
| 5 | # gives unlimited permission to copy and/or distribute it, | 5 | # gives unlimited permission to copy and/or distribute it, |
| 6 | # with or without modifications, as long as this notice is preserved. | 6 | # with or without modifications, as long as this notice is preserved. |