diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2015-01-23 16:47:35 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2015-01-23 16:47:35 +0100 |
| commit | a4f32dac3aa9fd9fd00dfb2dacaf039674437be0 (patch) | |
| tree | 22c063ae6d7784a889621c30f5215099bbb159e6 /elf/tlsdeschtab.h | |
| parent | d4e923339bd73d86f99c63b5ed00dcad0e817671 (diff) | |
| parent | 58695b88a9deaecbcf7794760cc333177edaa2b4 (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
hurd/hurdsocket.h
sysdeps/mach/hurd/errno-loc.c
Diffstat (limited to 'elf/tlsdeschtab.h')
| -rw-r--r-- | elf/tlsdeschtab.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/elf/tlsdeschtab.h b/elf/tlsdeschtab.h index 8ce8249b92..9a0f965c5f 100644 --- a/elf/tlsdeschtab.h +++ b/elf/tlsdeschtab.h @@ -1,5 +1,5 @@ /* Hash table for TLS descriptors. - Copyright (C) 2005-2013 Free Software Foundation, Inc. + Copyright (C) 2005-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Alexandre Oliva <aoliva@redhat.com> |