Merge from gnulib

[gnu-emacs] / lib / mktime.c

diff --git a/lib/mktime.c b/lib/mktime.c
index 48b3a40f9c73ee0c6f626f0278dba12ec86c4947..580bc8ed0043ddec65f84e6ec7171a0b508e343f 100644 (file)
--- a/lib/mktime.c
+++ b/lib/mktime.c
@@ -1,5 +1,5 @@
 /* Convert a 'struct tm' to a time_t value.
-   Copyright (C) 1993-2014 Free Software Foundation, Inc.
+   Copyright (C) 1993-2015 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Paul Eggert <eggert@twinsun.com>.