diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-03-25 02:32:12 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2015-03-25 02:32:12 +0100 |
| commit | c3bb673e376492360c895e3f70f49cbbdb48bbaf (patch) | |
| tree | 06995c131eac1424dd02fe383dba2d4293d653cf /bits/time.h | |
| parent | d7e5ff94db82853ff8e29017e535132bfc45b2c9 (diff) | |
| parent | 74509f87ae6e2ee8b87dec41c4e2d45fe2fae88f (diff) | |
Merge commit 'refs/top-bases/t/tls-threadvar' into t/tls-threadvar
Conflicts:
sysdeps/mach/hurd/bits/libc-tsd.h
Diffstat (limited to 'bits/time.h')
| -rw-r--r-- | bits/time.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bits/time.h b/bits/time.h index 763ac1a022..8b3c8e2d07 100644 --- a/bits/time.h +++ b/bits/time.h @@ -1,5 +1,5 @@ /* System-dependent timing definitions. Generic version. - Copyright (C) 1996-2013 Free Software Foundation, Inc. + Copyright (C) 1996-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or |