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 /lib/mktime-internal.h | |
| 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 'lib/mktime-internal.h')
| -rw-r--r-- | lib/mktime-internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mktime-internal.h b/lib/mktime-internal.h index 00e58abdd6c..92bdda6f6c3 100644 --- a/lib/mktime-internal.h +++ b/lib/mktime-internal.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* mktime variant that also uses an offset guess | 1 | /* mktime variant that also uses an offset guess |
| 2 | 2 | ||
| 3 | Copyright 2016-2017 Free Software Foundation, Inc. | 3 | Copyright 2016-2018 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This program is free software; you can redistribute it and/or | 5 | This program is free software; you can redistribute it and/or |
| 6 | modify it under the terms of the GNU General Public | 6 | modify it under the terms of the GNU General Public |