diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:41:39 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:41:39 +0000 |
commit | 16c9ca827cd735002dec5689f93f22fc358d6f56 (patch) | |
tree | fbfaa8e020a3a762a96c4f219d4150e369e00099 /elf/dl-conflict.c | |
parent | daa262720d3dc357a298b18a359551994082c9b3 (diff) | |
parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) |
Merge commit 'refs/top-bases/t/bits_atomic.h_multiple_threads' into t/bits_atomic.h_multiple_threadst/bits_atomic.h_multiple_threads
Diffstat (limited to 'elf/dl-conflict.c')
-rw-r--r-- | elf/dl-conflict.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/elf/dl-conflict.c b/elf/dl-conflict.c index d9ed24d884..70f14b04cd 100644 --- a/elf/dl-conflict.c +++ b/elf/dl-conflict.c @@ -1,5 +1,5 @@ /* Resolve conflicts against already prelinked libraries. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2001. |