aboutsummaryrefslogtreecommitdiffstats
path: root/lib/mktime.c
diff options
context:
space:
mode:
authorK. Handa2015-01-07 22:51:41 +0900
committerK. Handa2015-01-07 22:51:41 +0900
commit88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf (patch)
tree18da116400703b67738bdbbd38cc4abf4c1e929f /lib/mktime.c
parent3f79d3131629f73da16ec121d2a0056f11b70e65 (diff)
parent95295df44cc2b6e0e2442aeff96b0fe2ceac405c (diff)
downloademacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.tar.gz
emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.zip
Merge branch master of git.sv.gnu.org:/srv/git/emacs.
Diffstat (limited to 'lib/mktime.c')
-rw-r--r--lib/mktime.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mktime.c b/lib/mktime.c
index 48b3a40f9c7..580bc8ed004 100644
--- a/lib/mktime.c
+++ b/lib/mktime.c
@@ -1,5 +1,5 @@
1/* Convert a 'struct tm' to a time_t value. 1/* Convert a 'struct tm' to a time_t value.
2 Copyright (C) 1993-2014 Free Software Foundation, Inc. 2 Copyright (C) 1993-2015 Free Software Foundation, Inc.
3 This file is part of the GNU C Library. 3 This file is part of the GNU C Library.
4 Contributed by Paul Eggert <eggert@twinsun.com>. 4 Contributed by Paul Eggert <eggert@twinsun.com>.
5 5